功能提交：中间人比例保存到客户中

modules/admin/src/main/java/com/fire/admin/mapper/PartnerUserMapper.java

@@ -39,7 +39,7 @@ public interface PartnerUserMapper extends BaseMapper<PartnerUserInfo> {
     int deletePartnerUserInfo(@Param("info") PartnerUserInfo partnerUserInfo);
 
 
-    @Select("select customer_id,user_id,partner_name,partner_commission from partner_user_info where customer_id=#{customerId}")
+    @Select("select customer_id,user_id,partner_name from partner_user_info where customer_id=#{customerId}")
     List<PartnerUserInfo> selectPartnerUserInfoByCustomerId(Long customerId);
 
 }

modules/admin/src/main/java/com/fire/admin/service/impl/CustomerServiceImpl.java

@@ -82,15 +82,14 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerMapper, CustomerInf
             infoVos.forEach(info -> {
                 // TODO 获取客户的可用金额
                 info.setBalance(new BigDecimal(jedisCluster.hget(CUSTOMER_AMOUNT.key(), CUSTOMER_AMOUNT.key().concat(info.getCustomerId().toString()))).divide(new BigDecimal(10000)).setScale(4, RoundingMode.DOWN));
+                // TODO 对提成比例进行处理
+                if(ObjectUtil.isNotEmpty(info.getPartnerCommission())){
+                    info.setPartnerCommission(info.getPartnerCommission().multiply(new BigDecimal(1000)).setScale(4,RoundingMode.DOWN));
+                }
                 // TODO  返回客户的银行卡信息
                 info.setBankCards(bankCardService.getBankCardList(info.getCustomerId(), 2));
                 if (ObjectUtil.isNotEmpty(info.getCreditAmount())) {
-                    info.setCreditAmount(new BigDecimal(info.getCreditAmount()).divide(new BigDecimal(10000)).setScale(4, RoundingMode.HALF_DOWN).toString());
-                }
-                if (!info.getPartnerUsers().isEmpty()) {
-                    info.getPartnerUsers().forEach(partner -> {
-                        partner.setPartnerCommission((partner.getPartnerCommission().multiply(new BigDecimal(1000).setScale(0, RoundingMode.DOWN))));
-                    });
+                    info.setCreditAmount(new BigDecimal(info.getCreditAmount()).divide(new BigDecimal(1000)).setScale(4, RoundingMode.HALF_DOWN).toString());
                 }
             });
         }
@@ -122,13 +121,11 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerMapper, CustomerInf
                 .isDeleted(0)
                 .creator(SecurityUtil.getUser().getUsername())
                 .createTime(DateUtils.strformatDatetime(LocalDateTime.now()))
+                .partnerCommission(customerDto.getPartnerCommission())
                 .userId(customerDto.getUserId())
                 .priceCheck(customerDto.getPriceCheck()).build();
         // TODO 新增中间人关联关系
         if (!customerDto.getPartnerUsers().isEmpty()) {
-            customerDto.getPartnerUsers().forEach(info -> {
-                info.getPartnerCommission().divide(new BigDecimal(1000)).setScale(4, RoundingMode.DOWN);
-            });
             partnerUserMapper.insertUpdateBeatchPartnerUserInfo(customerDto.getPartnerUsers());
         }
 
@@ -181,6 +178,9 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerMapper, CustomerInf
      */
     @Override
     public void updateCustomerInfo(CustomerDto customerDto) {
+        if(ObjectUtil.isNotEmpty(customerDto.getPartnerCommission())){
+            customerDto.setPartnerCommission(customerDto.getPartnerCommission().divide(new BigDecimal(1000)).setScale(4,RoundingMode.DOWN));
+        }
         CustomerInfo customerInfo = CustomerInfo.builder().customerId(customerDto.getCustomerId())
                 .customerName(customerDto.getCustomerName())
                 .shorterName(customerDto.getShorterName())
@@ -196,13 +196,11 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerMapper, CustomerInf
                 .isDeleted(customerDto.getIsDeleted())
                 .updator(SecurityUtil.getUser().getUsername())
                 .updateTime(DateUtils.strformatDatetime(LocalDateTime.now()))
+                .partnerCommission(customerDto.getPartnerCommission())
                 .userId(customerDto.getUserId())
                 .priceCheck(customerDto.getPriceCheck()).build();
         // TODO 修改客户中间人信息
         if (!customerDto.getPartnerUsers().isEmpty()) {
-            customerDto.getPartnerUsers().forEach(info -> {
-                info.setPartnerCommission(info.getPartnerCommission().divide(new BigDecimal(1000)).setScale(4, RoundingMode.DOWN));
-            });
             log.info("修改的中间人信息为：【{}】", JSONUtil.parse(customerDto.getPartnerUsers()));
             partnerUserMapper.insertUpdateBeatchPartnerUserInfo(customerDto.getPartnerUsers());
         }

modules/admin/src/main/resources/mapper/PartnerUserMapper.xml

@@ -23,7 +23,9 @@
         )
     </foreach>
     ON DUPLICATE KEY UPDATE
-
+    customer_id=VALUES(customer_id),
+    user_id=VALUES(user_id),
+    partner_name=VALUES(partner_name)
 </insert>