张延森 2 vuotta sitten
vanhempi
commit
2f8bed1dd6

+ 2
- 1
src/main/java/com/yunzhi/marketing/broker/controller/BrokerController.java Näytä tiedosto

@@ -88,7 +88,6 @@ public class BrokerController extends BaseController {
88 88
         return ResponseBean.success(result);
89 89
     }
90 90
 
91
-
92 91
     @RequestMapping(value="/wx/bindBroker",method= RequestMethod.PUT)
93 92
     @ApiOperation(value="成为经纪人", notes = "成为经纪人", httpMethod = "PUT", response = ResponseBean.class)
94 93
     public ResponseBean bindBroker(@ApiParam("经纪人信息") @RequestBody BrokerVO brokerVO,
@@ -105,6 +104,8 @@ public class BrokerController extends BaseController {
105 104
         taPerson.setSettledCommission(null);
106 105
         taPerson.setUnsettledCommission(null);
107 106
 
107
+        // 处理银行卡信息
108
+        iBkBankCardService.mergeList(personId, brokerVO.getBankCardList());
108 109
 
109 110
         // 更新数据
110 111
         if (!iTaPersonService.updateById(taPerson)) {

+ 3
- 0
src/main/java/com/yunzhi/marketing/broker/entity/BkAgentRule.java Näytä tiedosto

@@ -35,6 +35,9 @@ public class BkAgentRule implements Serializable {
35 35
     @ApiModelProperty(value = "规则内容")
36 36
     private String content;
37 37
 
38
+    @ApiModelProperty(value = "海报背景")
39
+    private String poster;
40
+
38 41
     @ApiModelProperty(value = "推荐金额")
39 42
     private Integer referralFee;
40 43
 

+ 3
- 1
src/main/resources/mapper/xlk/ChannelCustomerMapper.xml Näytä tiedosto

@@ -186,10 +186,12 @@
186 186
     <select id="getMoreInfoById" resultType="com.yunzhi.marketing.xlk.entity.ChannelCustomer">
187 187
         SELECT
188 188
             t.*,
189
-            s.channel_name
189
+            s.channel_name,
190
+            IFNULL(m.`name`, m.nickname) as recommend_person_name
190 191
         FROM
191 192
             xlk_channel_customer t
192 193
                 LEFT JOIN ta_channel s ON t.channel_id = s.channel_id
194
+            LEFT JOIN ta_person m ON m.person_id = t.recommend_person
193 195
         WHERE
194 196
             t.channel_customer_id = #{id}
195 197
     </select>