张延森 2 年前
父节点
当前提交
2f8bed1dd6

+ 2
- 1
src/main/java/com/yunzhi/marketing/broker/controller/BrokerController.java 查看文件

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

+ 3
- 0
src/main/java/com/yunzhi/marketing/broker/entity/BkAgentRule.java 查看文件

35
     @ApiModelProperty(value = "规则内容")
35
     @ApiModelProperty(value = "规则内容")
36
     private String content;
36
     private String content;
37
 
37
 
38
+    @ApiModelProperty(value = "海报背景")
39
+    private String poster;
40
+
38
     @ApiModelProperty(value = "推荐金额")
41
     @ApiModelProperty(value = "推荐金额")
39
     private Integer referralFee;
42
     private Integer referralFee;
40
 
43
 

+ 3
- 1
src/main/resources/mapper/xlk/ChannelCustomerMapper.xml 查看文件

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