功能提交：中间人提成比例修改

common/fire-dto/src/main/java/com/fire/dto/CustomerInfo.java

@@ -76,6 +76,8 @@ public class CustomerInfo {
     @ApiModelProperty(value = "修改时间")
     private String updateTime;
 
+    @ApiModelProperty(value = "代理商提成比例（按照面额计算）")
+    private BigDecimal partnerCommission;
 
     @ApiModelProperty(value = "跟用户关联，客户登录使用")
     private Long userId;

common/fire-dto/src/main/java/com/fire/dto/PartnerUserInfo.java

@@ -31,7 +31,5 @@ public class PartnerUserInfo {
     @NotNull(message = "用户名称为空")
     private String partnerName;
 
-    @ApiModelProperty(value = "代理商提成比例（按照面额计算）")
-    private BigDecimal partnerCommission;
 
 }

modules/admin/src/main/java/com/fire/admin/dto/CustomerDto.java

@@ -87,4 +87,7 @@ public class CustomerDto {
     @ApiModelProperty("中间人集合")
     private List<PartnerUserInfo> partnerUsers;
 
+    @ApiModelProperty(value = "代理商提成比例（按照面额计算）")
+    private BigDecimal partnerCommission;
+
 }

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

@@ -79,7 +79,7 @@ public class AdditionalPaymentServiceImpl extends ServiceImpl<AdditionalPaymentM
         // TODO 获取当前操作的人的用户名
         String username = SecurityUtil.getUser().getUsername();
 
-        if (additionalPaymentDto.getType().equals("customer")) {
+        if (additionalPaymentDto.getType().equals("customer") && additionalPaymentDto.getAmount().longValue() > 0) {
             additionalPaymentDto.setId(jedisCluster.incr(GLOBAL_ID_INCR.key()));
             additionalPaymentDto.setDistinguish(2);
 
@@ -101,7 +101,7 @@ public class AdditionalPaymentServiceImpl extends ServiceImpl<AdditionalPaymentM
             Long amount = redisAmountScript.changeAmount(CUSTOMER_AMOUNT.key(), Long.parseLong(additionalPaymentDto.getRelationId()), "add", additionalPaymentDto.getAmount().multiply(new BigDecimal(10000)).longValue(), 0L);
 
             if (count > 0 && ObjectUtil.isNotEmpty(amount)) {
-                log.info("客户加款成功，客户编号为：【{}】，客户名称为：【{}】，加款金额为：【{}】", additionalPaymentDto.getRelationId(),param.get("name"), additionalPaymentDto.getAmount());
+                log.info("客户加款成功，客户编号为：【{}】，客户名称为：【{}】，加款金额为：【{}】", additionalPaymentDto.getRelationId(), param.get("name"), additionalPaymentDto.getAmount());
                 log.info("加款入流水队列，加款之前的金额为：【{}】,操作金额为：【{}】,加款之后的金额为：【{}】，详情为：【{}】", new BigDecimal(param.get("beforeAmount").toString()).divide(new BigDecimal(10000)).setScale(4, RoundingMode.DOWN), additionalPaymentDto.getAmount(), new BigDecimal(param.get("afterAmount").toString()).divide(new BigDecimal(10000)).setScale(4, RoundingMode.DOWN), param);
                 rocketMQTemplate.syncSend(TRANSACTION_TOPIC, MessageBuilder.withPayload(param).build());
             } else {
@@ -123,6 +123,9 @@ public class AdditionalPaymentServiceImpl extends ServiceImpl<AdditionalPaymentM
                 log.info("供应商加款失败，编号为：【{}】的加款记录将被删除,供应商编号为：【{}】，加款金额为：【{}】", additionalPaymentDto.getId(), additionalPaymentDto.getRelationId(), additionalPaymentDto.getAmount());
                 baseMapper.deleteById(additionalPaymentDto.getId());
             }
+        }else {
+            log.info("加款金额参数不合符");
+            throw new BaseException("577","加款金额参数不合法");
         }
 
     }
@@ -303,7 +306,7 @@ public class AdditionalPaymentServiceImpl extends ServiceImpl<AdditionalPaymentM
                     // TODO 获取撤销的具体金额
                     BigDecimal canceprice = additionalPaymentDto.getAmount().divide(new BigDecimal(10000)).setScale(4, RoundingMode.DOWN);
                     log.info("客户款项撤销入流水队列，撤销之前的金额为：【{}】,操作金额为：【{}】,撤销之后的金额为：【{}】，详情为：【{}】", new BigDecimal(param.get("beforeAmount").toString()).divide(new BigDecimal(10000)).setScale(4, RoundingMode.DOWN), canceprice, new BigDecimal(param.get("afterAmount").toString()).divide(new BigDecimal(10000)).setScale(4, RoundingMode.DOWN), param);
-                    log.info("客户款项撤销。 客户编号为：【{}】,客户名称为：【{}】 撤销金额为：【{}】 ，授信额度为：【{}】 剩余额度为：【{}】", payment.getRelationId(),param.get("name"), canceprice, new BigDecimal(customerInfo.getCreditAmount()).divide(new BigDecimal(10000)).setScale(4, RoundingMode.DOWN), new BigDecimal(amount).divide(new BigDecimal(10000)).setScale(4, RoundingMode.DOWN));
+                    log.info("客户款项撤销。 客户编号为：【{}】,客户名称为：【{}】 撤销金额为：【{}】 ，授信额度为：【{}】 剩余额度为：【{}】", payment.getRelationId(), param.get("name"), canceprice, new BigDecimal(customerInfo.getCreditAmount()).divide(new BigDecimal(10000)).setScale(4, RoundingMode.DOWN), new BigDecimal(amount).divide(new BigDecimal(10000)).setScale(4, RoundingMode.DOWN));
                     rocketMQTemplate.syncSend(TRANSACTION_TOPIC, MessageBuilder.withPayload(param).build());
                     return payment.getRelationId().concat("_").concat(amount.toString());
                 } else {

modules/admin/src/main/java/com/fire/admin/vo/CustomerInfoVo.java

@@ -115,6 +115,9 @@ public class CustomerInfoVo {
     @ApiModelProperty(value = "客户登录名称")
     private String loginName;
 
+    @ApiModelProperty(value = "代理商提成比例（按照面额计算）")
+    private BigDecimal partnerCommission;
+
     @ApiModelProperty("银行卡列表")
     private List<BankCard> bankCards;
 

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

@@ -23,6 +23,7 @@
         <result column="update_time" property="updateTime"/>
         <result column="user_id" property="userId"/>
         <result column="price_check" property="priceCheck"/>
+        <result column="partner_commission" property="partnerCommission"/>
     </resultMap>
 
 
@@ -55,6 +56,7 @@
         <result column="channel_id" property="channelId"/>
         <result column="price_check" property="priceCheck"/>
         <result column="user_id" property="userId"/>
+        <result column="partner_commission" property="partnerCommission"/>
         <!-- 获取客户登录用户姓名 -->
         <collection property="loginName" ofType="java.lang.String"
                     select="com.fire.admin.mapper.SysUserMapper.getCustomerUserName"
@@ -83,6 +85,7 @@
         c.updator,
         c.update_time,
         c.price_check,
+        c.partner_commission,
         c.user_id,
         app.flow_app_id,
         app.app_id,

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

@@ -7,25 +7,22 @@
         <result column="customer_id" property="customerId"/>
         <result column="user_id" property="userId"/>
         <result column="partner_name" property="partnerName"/>
-        <result column="partner_commission" property="partnerCommission"/>
     </resultMap>
 
 
 <insert id="insertUpdateBeatchPartnerUserInfo" parameterType="java.util.List">
     INSERT  INTO
     partner_user_info
-    (customer_id,user_id,partner_name,partner_commission)
+    (customer_id,user_id,partner_name)
     VALUE
     <foreach collection="list" item="item" index="index" separator=",">
         (
             #{item.customerId},
             #{item.userId},
-            #{item.partnerName},
-            #{item.partnerCommission}
+            #{item.partnerName}
         )
     </foreach>
     ON DUPLICATE KEY UPDATE
-    partner_commission=VALUES(partner_commission);
 
 </insert>