feats

src/main/java/com/yunzhi/marketing/broker/controller/BkNoticeController.java

@@ -62,7 +62,7 @@ public class BkNoticeController extends BaseController {
         IPage<BkNotice> pg = new Page<>(pageNum, pageSize);
         QueryWrapper<BkNotice> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq(!StringUtils.isEmpty(noticeType), "notice_type", noticeType);
-        queryWrapper.eq("wx".equals(client) && mine, "person_id", getPersonId(request));
+        queryWrapper.eq("wx".equals(client) && null != mine && mine, "person_id", getPersonId(request));
         queryWrapper.gt("status", CommConstant.STATUS_DELETE);
 
         if ("admin".equals(client)) {

src/main/java/com/yunzhi/marketing/service/impl/TaRecommendCustomerServiceImpl.java

@@ -814,9 +814,7 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
             taRecommendCustomerVO.setCustomerVisit(customerVisit);
         }
 
-        LambdaQueryWrapper<ChannelCustomer> channelCustomerLambdaQueryWrapper = new LambdaQueryWrapper<>();
-        channelCustomerLambdaQueryWrapper.eq(ChannelCustomer::getCustomerId,id);
-        ChannelCustomer customer = channelCustomerMapper.selectOne(channelCustomerLambdaQueryWrapper);
+        ChannelCustomer customer = channelCustomerMapper.getMoreInfoById(null, id);
         if (null != customer) {
             taRecommendCustomerVO.setChannelCustomer(customer);
         }

src/main/java/com/yunzhi/marketing/xlk/controller/ChannelCustomerController.java

@@ -160,9 +160,9 @@ public class ChannelCustomerController extends BaseController {
      */
     @ApiOperation(value = "森哥看这里-wx-驻场确认结佣", notes = "森哥看这里-wx-驻场确认结佣")
     @RequestMapping(value="/{plat}/marking/{bizType}",method= RequestMethod.PUT)
-    public ResponseBean commissionCustomer(@RequestParam String bizType,
+    public ResponseBean commissionCustomer(@PathVariable String bizType,
                                            @RequestBody MarkingSignatoryCustomerDTO params) throws Exception {
-        List<String> whiteList = Arrays.asList("commission", "signatory");
+        List<String> whiteList = Arrays.asList("commission", "signatory", "all-payment");
         if (!whiteList.contains(bizType)) {
             return ResponseBean.error("404接口不存在", ResponseBean.ERROR_ILLEGAL_PARAMS);
         }

src/main/java/com/yunzhi/marketing/xlk/dto/MarkingSignatoryCustomerDTO.java

@@ -36,4 +36,7 @@ public class MarkingSignatoryCustomerDTO implements Serializable {
 
     /** 待结算佣金 **/
     private Integer unsettledCommission;
+
+    /** 本次结佣 **/
+    private Integer currentCommission;
 }

src/main/java/com/yunzhi/marketing/xlk/mapper/ChannelCustomerMapper.java

@@ -57,7 +57,7 @@ public interface ChannelCustomerMapper extends BaseMapper<ChannelCustomer> {
 
     List<CustomerDetailVO> getSuccessCustomerDetail(@Param("params") StatisticsDTO statisticsDTo);
 
-    ChannelCustomer getMoreInfoById(String id);
+    ChannelCustomer getMoreInfoById(@Param("channelCustomerId") String channelCustomerId, @Param("customerId") String customerId);
 
     List<ChannelCustomer> getRecommendedOrExpired(@Param("buildingId") String buildingId,@Param("phone") String phone);
 }

src/main/java/com/yunzhi/marketing/xlk/service/impl/ChannelCustomerServiceImpl.java

@@ -511,7 +511,7 @@ public class ChannelCustomerServiceImpl extends ServiceImpl<ChannelCustomerMappe
 
     @Override
     public ChannelCustomer getMoreInfoById(String id) {
-        return channelCustomerMapper.getMoreInfoById(id);
+        return channelCustomerMapper.getMoreInfoById(id, null);
     }
 
     @Override
@@ -608,7 +608,7 @@ public class ChannelCustomerServiceImpl extends ServiceImpl<ChannelCustomerMappe
         customer.setTotalCommission(intIfNvl(params.getTotalCommission()));
 
         Integer settledCommission = intIfNvl(bkAccountRecordMapper.getTotalChargesBy(customer.getChannelCustomerId(), bizType));
-        settledCommission += intIfNvl(params.getSettledCommission()); // 最新的需要加上本次结算佣金
+        settledCommission += intIfNvl(params.getCurrentCommission()); // 最新的需要加上本次结算佣金
         recommendPerson.setSettledCommission(intIfNvl(recommendPerson.getSettledCommission()) -
                 intIfNvl(customer.getSettledCommission()) +
                 settledCommission);
@@ -621,7 +621,7 @@ public class ChannelCustomerServiceImpl extends ServiceImpl<ChannelCustomerMappe
         // 生成佣金记录
         BkAccountRecord bkAccountRecord = bkAccountRecordMapper.getRecordBy(customer.getChannelCustomerId(), bizType);
         if (bkAccountRecord != null) {
-            bkAccountRecord.setCharges(params.getSettledCommission());
+            bkAccountRecord.setCharges(params.getCurrentCommission());
             bkAccountRecordMapper.updateById(bkAccountRecord);
         } else {
             bkAccountRecord = new BkAccountRecord();
@@ -630,7 +630,7 @@ public class ChannelCustomerServiceImpl extends ServiceImpl<ChannelCustomerMappe
             bkAccountRecord.setBuildingId(taBuilding.getBuildingId());
             bkAccountRecord.setBuildingName(StringUtils.ifNull(taBuilding.getName(), taBuilding.getBuildingName()));
             bkAccountRecord.setCustomerName(customer.getName());
-            bkAccountRecord.setCharges(intIfNvl(params.getSettledCommission()));
+            bkAccountRecord.setCharges(intIfNvl(params.getCurrentCommission()));
             bkAccountRecord.setChargeType(1);
             bkAccountRecord.setChargeCode(bizType);
             bkAccountRecord.setStatus(CommConstant.STATUS_NORMAL);

src/main/resources/mapper/xlk/ChannelCustomerMapper.xml

@@ -192,8 +192,13 @@
             xlk_channel_customer t
                 LEFT JOIN ta_channel s ON t.channel_id = s.channel_id
             LEFT JOIN ta_person m ON m.person_id = t.recommend_person
-        WHERE
-            t.channel_customer_id = #{id}
+        WHERE 1 = 1
+             <if test="channelCustomerId != null and channelCustomerId != ''">
+                 AND t.channel_customer_id = #{channelCustomerId}
+            </if>
+            <if test="customerId != null and customerId != ''">
+                AND t.customer_id = #{customerId}
+            </if>
     </select>
     <select id="getRecommendedOrExpired" resultType="com.yunzhi.marketing.xlk.entity.ChannelCustomer">
         SELECT