功能提交：调整供应商加款

modules/admin/src/main/java/com/fire/admin/rest/SupplierAdditionalPaymentRest.java

@@ -30,7 +30,7 @@ public class SupplierAdditionalPaymentRest {
     @ApiOperation("供应商加款")
     @PostMapping("/add")
     public BaseResponse makeAdditionalPayment(@RequestBody AdditionalPaymentDto additionalPaymentDto) {
-        additionalPaymentService.insertSupplierAdditionalPayment(additionalPaymentDto);
+        additionalPaymentService.insertAdditionalPaymen(additionalPaymentDto);
         return new BaseResponse();
     }
 
@@ -52,6 +52,6 @@ public class SupplierAdditionalPaymentRest {
     @ApiOperation("供应商加款撤销")
     @PostMapping("/cancel")
     public BaseRestResponse additionalPayment(@RequestBody AdditionalPaymentDto additionalPaymentDto) {
-        return new BaseRestResponse(additionalPaymentService.cancelSupplierAdditionalPayment(additionalPaymentDto));
+        return new BaseRestResponse(additionalPaymentService.cancelAdditionalPayment(additionalPaymentDto));
     }
 }

modules/admin/src/main/java/com/fire/admin/service/AdditionalPaymentService.java

@@ -30,7 +30,7 @@ public interface AdditionalPaymentService extends IService<AdditionalPayment> {
      * @return: void
      * @Date: 2021/6/4 15:57
      */
-    void insertSupplierAdditionalPayment(AdditionalPaymentDto additionalPaymentDto);
+    /*void insertSupplierAdditionalPayment(AdditionalPaymentDto additionalPaymentDto);*/
 
     /**
      * @Description: TODO 分页获取客户账户信息
@@ -75,5 +75,5 @@ public interface AdditionalPaymentService extends IService<AdditionalPayment> {
      * @return: String
      * @Date: 2021/6/8 14:58
      */
-    String cancelSupplierAdditionalPayment(AdditionalPaymentDto additionalPaymentDto);
+    /*String cancelSupplierAdditionalPayment(AdditionalPaymentDto additionalPaymentDto);*/
 }

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

@@ -73,35 +73,19 @@ public class AdditionalPaymentServiceImpl extends ServiceImpl<AdditionalPaymentM
                 log.info("加款失败，加款编号为：【{}】将删除此条记录,客户编号为：【{}】，加款金额为：【{}】", additionalPaymentDto.getId(), additionalPaymentDto.getRelationId(), additionalPaymentDto.getAmount());
                 baseMapper.deleteById(additionalPaymentDto.getId());
             }
-        } else if (additionalPaymentDto.getType().equals("suppler")) {
+        } else if (additionalPaymentDto.getType().equals("supplier")) {
             additionalPaymentDto.setId(jedisCluster.incr(GLOBAL_ID_INCR.key()));
             additionalPaymentDto.setDistinguish(1);
-            // TODO 供应商加款
-            this.additionalPayment(additionalPaymentDto);
-        }
-
-    }
-
-    /**
-     * @Description: TODO 供应商新增加款记录
-     * @Param: [additionalPaymentDto]
-     * @return: void
-     * @Date: 2021/6/4 15:28
-     */
-    @Override
-    public void insertSupplierAdditionalPayment(AdditionalPaymentDto additionalPaymentDto) {
-        if (additionalPaymentDto.getType().equals("supplier")) {
-            additionalPaymentDto.setDistinguish(1);
-            // TODO 客户加款
+            //  供应商加款
             int count = this.additionalPayment(additionalPaymentDto);
-            if (count > 0) {
-                // TODO 加款成功之后，把加款的金额写入数据库
-                redisAmountScript.changeAmount(SUPPLIER_AMOUNT.key(), Long.getLong(additionalPaymentDto.getRelationId()), "add", additionalPaymentDto.getAmount().multiply(new BigDecimal(10000)).longValue(), 0L);
+            Long amount = redisAmountScript.changeAmount(SUPPLIER_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(), additionalPaymentDto.getAmount());
+            } else {
+                // 供应商加款失败，删除该条加款记录
+                log.info("供应商加款失败，编号为：【{}】的加款记录将被删除,供应商编号为：【{}】，加款金额为：【{}】", additionalPaymentDto.getId(), additionalPaymentDto.getRelationId(), additionalPaymentDto.getAmount());
+                baseMapper.deleteById(additionalPaymentDto.getId());
             }
-        } else if (additionalPaymentDto.getType().equals("supplier")) {
-            additionalPaymentDto.setDistinguish(1);
-            // TODO 供应商加款
-            this.additionalPayment(additionalPaymentDto);
         }
 
     }
@@ -222,8 +206,8 @@ public class AdditionalPaymentServiceImpl extends ServiceImpl<AdditionalPaymentM
                 log.info("客户编号为“【{}】 款项撤销失败，撤销金额为：【{}】", additionalPaymentDto.getRelationId(), additionalPaymentDto.getAmount().divide(new BigDecimal(10000), 2, BigDecimal.ROUND_DOWN));
                 throw new BaseException(Status.ACCOUNT_CANCEL_FAIL.status(), Status.ACCOUNT_CANCEL_FAIL.message());
             }
-        }else if(ObjectUtil.isNotEmpty(additionalPaymentDto.getRelationId()) && additionalPaymentDto.getType().equals("suppler")){
-            payment.setUndo(2);
+        } else if (ObjectUtil.isNotEmpty(additionalPaymentDto.getRelationId()) && additionalPaymentDto.getType().equals("supplier")) {
+            payment.setUndo(1);
             // TODO 进行账户撤销
             Long amount = redisAmountScript.changeAmount(SUPPLIER_AMOUNT.key(), Long.parseLong(payment.getRelationId()), "sub", payment.getAmount(), 100000000000L);
             if (ObjectUtil.isNotEmpty(amount)) {
@@ -236,46 +220,18 @@ public class AdditionalPaymentServiceImpl extends ServiceImpl<AdditionalPaymentM
                 log.info("供应商编号为“【{}】 款项撤销失败，撤销金额为：【{}】", additionalPaymentDto.getRelationId(), additionalPaymentDto.getAmount().divide(new BigDecimal(10000), 2, BigDecimal.ROUND_DOWN));
                 throw new BaseException(Status.ACCOUNT_CANCEL_FAIL.status(), Status.ACCOUNT_CANCEL_FAIL.message());
             }
-        }else {
+        } else {
             log.info("客户或供应商款项撤销前端参数传递有误！！！");
-            throw new BaseException(Status.REQUEST_PARAM_ERROR.status(),Status.REQUEST_PARAM_ERROR.message()) ;       }
-    }
-
-    /**
-     * @Description:   供应商加款撤销
-     * @Param: additionalPaymentDto
-     * @return: void
-     * @Date: 2021/6/8 14:57
-     */
-    @Override
-    public String cancelSupplierAdditionalPayment(AdditionalPaymentDto additionalPaymentDto) {
-
-        if (ObjectUtil.isNotEmpty(additionalPaymentDto.getRelationId()) && additionalPaymentDto.getType().equals("supplier")) {
-            additionalPaymentDto.setUndo(1);
-            //  实例化对象
-            AdditionalPayment payment = this.formatAdditionalPaymentDto(additionalPaymentDto);
-            //  修改记录的撤销状态
-            int count = baseMapper.updateById(payment);
-
-            if (count > 0) {
-                // 撤销
-                Long amount = redisAmountScript.changeAmount(SUPPLIER_AMOUNT.key(), Long.parseLong(payment.getRelationId()), "sub", payment.getAmount(),100000000L);
-                log.info("供应商加款撤销。 供应商编号为：【{}】 撤销金额为：【{}】 ，授信额度为：【{}】 剩余额度为：【{}】", payment.getRelationId(), additionalPaymentDto.getAmount(), new BigDecimal(100000000L).divide(new BigDecimal("10000"), 2, BigDecimal.ROUND_DOWN), new BigDecimal(amount).divide(new BigDecimal("10000"), 2, BigDecimal.ROUND_DOWN));
-                return payment.getRelationId().concat("_").concat(amount.toString());
-            }
+            throw new BaseException(Status.REQUEST_PARAM_ERROR.status(), Status.REQUEST_PARAM_ERROR.message());
         }
-
-        return null;
-
     }
 
-    private AdditionalPayment formatAdditionalPaymentDto(AdditionalPaymentDto additionalPaymentDto){
-       return AdditionalPayment.builder()
+    private AdditionalPayment formatAdditionalPaymentDto(AdditionalPaymentDto additionalPaymentDto) {
+        return AdditionalPayment.builder()
                 .id(additionalPaymentDto.getId())
                 .relationId(additionalPaymentDto.getRelationId())
                 .amount(additionalPaymentDto.getAmount().longValue())
                 .build();
     }
 
-
 }

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapp
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fire.admin.mapper.BankCardMapper;
 import com.fire.admin.service.BankCardService;
+import com.fire.admin.util.SecurityUtil;
 import com.fire.dto.BankCard;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -53,21 +54,16 @@ public class BankCardServiceImpl extends ServiceImpl<BankCardMapper, BankCard> i
             for (BankCard bankCard : bankCards) {
                 if (bankCard.getId() == null) {
                     bankCard.setId(jedisCluster.incr(GLOBAL_ID_INCR.key()));
-                    bankCard.setCreator("admin");
+                    bankCard.setCreator(SecurityUtil.getUser().getUsername());
                     bankCard.setCreateTime(new Date());
-                } else {
-                    bankCard.setUpdator("admin");
-                    bankCard.setUpdateTime(new Date());
-                }
-            }
-            this.saveOrUpdateBatch(bankCards);
-            for (BankCard bankCard : bankCards) {
-                if (bankCard.getId() == null) {
                     log.info("添加的银行卡是:【{}】", bankCards);
                 } else {
+                    bankCard.setUpdator(SecurityUtil.getUser().getUsername());
+                    bankCard.setUpdateTime(new Date());
                     log.info("修改的银行卡是:【{}】", bankCards);
                 }
             }
+            this.saveOrUpdateBatch(bankCards);
         }
     }
 

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

@@ -8,6 +8,7 @@ import com.fire.admin.mapper.ChannelGroupMapper;
 import com.fire.admin.request.ChannelGroupPageParam;
 import com.fire.admin.service.ChannelGroupService;
 import com.fire.admin.service.DistributeGroupService;
+import com.fire.admin.util.SecurityUtil;
 import com.fire.common.exception.BaseException;
 import com.fire.dto.ChannelGroup;
 import com.fire.dto.enums.Status;
@@ -67,7 +68,7 @@ public class ChannelGroupServiceImpl extends ServiceImpl<ChannelGroupMapper, Cha
             if (channelGroup.getChannelGroupId() == null) {
                 channelGroup.setChannelGroupId(jedisCluster.incr(GLOBAL_ID_INCR.key()));
             }
-            channelGroup.setCreator("admin");
+            channelGroup.setCreator(SecurityUtil.getUser().getUsername());
             channelGroup.setCreateTime(new Date());
             int result = baseMapper.insert(channelGroup);
             if (result > 0) {
@@ -82,7 +83,7 @@ public class ChannelGroupServiceImpl extends ServiceImpl<ChannelGroupMapper, Cha
     @Override
     public void updateChannelGroupById(ChannelGroup channelGroup) {
         if (channelGroup != null) {
-            channelGroup.setUpdator("admin");
+            channelGroup.setUpdator(SecurityUtil.getUser().getUsername());
             channelGroup.setUpdateTime(new Date());
             int result = baseMapper.updateById(channelGroup);
             if (result > 0) {

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

@@ -10,6 +10,7 @@ import com.fire.admin.request.ChannelPageParam;
 import com.fire.admin.service.ChannelInfoService;
 import com.fire.admin.service.ChannelProductService;
 import com.fire.admin.service.SupplierService;
+import com.fire.admin.util.SecurityUtil;
 import com.fire.common.exception.BaseException;
 import com.fire.dto.ChannelInfo;
 import com.fire.dto.ChannelSupplier;
@@ -88,7 +89,7 @@ public class ChannelInfoServiceImpl extends ServiceImpl<ChannelInfoMapper, Chann
     @Override
     public void updateChannelInfoById(ChannelInfo channelInfo) {
         if (channelInfo != null) {
-            channelInfo.setUpdator("admin");
+            channelInfo.setUpdator(SecurityUtil.getUser().getUsername());
             channelInfo.setUpdateTime(new Date());
             int result = baseMapper.updateById(channelInfo);
             if (result > 0) {
@@ -111,7 +112,7 @@ public class ChannelInfoServiceImpl extends ServiceImpl<ChannelInfoMapper, Chann
             if (channelInfo.getChannelId() == null) {
                 channelInfo.setChannelId(jedisCluster.incr(GLOBAL_ID_INCR.key()));
             }
-            channelInfo.setCreator("admin");
+            channelInfo.setCreator(SecurityUtil.getUser().getUsername());
             channelInfo.setCreateTime(new Date());
             int result = baseMapper.insert(channelInfo);
             if (result > 0) {
@@ -130,7 +131,7 @@ public class ChannelInfoServiceImpl extends ServiceImpl<ChannelInfoMapper, Chann
             for (ChannelInfo info : channelInfos) {
                 if (info.getChannelId() == null) {
                     info.setChannelId(jedisCluster.incr(GLOBAL_ID_INCR.key()));
-                    info.setCreator("admin");
+                    info.setCreator(SecurityUtil.getUser().getUsername());
                     info.setCreateTime(new Date());
                     log.info("添加的通道是：", channelInfos);
                 } else {

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

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fire.admin.mapper.DistributeGroupMapper;
 import com.fire.admin.service.ChannelInfoService;
 import com.fire.admin.service.DistributeGroupService;
+import com.fire.admin.util.SecurityUtil;
 import com.fire.common.exception.BaseException;
 import com.fire.dto.DistributeGroup;
 import com.fire.dto.enums.Status;
@@ -104,7 +105,7 @@ public class DistributeGroupServiceImpl extends ServiceImpl<DistributeGroupMappe
     @Override
     public void updateDistributeGroupById(DistributeGroup distributeGroup) {
         if (distributeGroup != null) {
-            distributeGroup.setUpdator("admin");
+            distributeGroup.setUpdator(SecurityUtil.getUser().getUsername());
             distributeGroup.setUpdateTime(new Date());
         }
         int distResult = baseMapper.updateById(distributeGroup);

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

@@ -10,6 +10,7 @@ import com.fire.admin.request.SupplierPageParam;
 import com.fire.admin.service.BankCardService;
 import com.fire.admin.service.ChannelInfoService;
 import com.fire.admin.service.SupplierService;
+import com.fire.admin.util.SecurityUtil;
 import com.fire.common.exception.BaseException;
 import com.fire.dto.ChannelSupplier;
 import com.fire.dto.enums.Status;
@@ -81,7 +82,7 @@ public class SupplierServiceImpl extends ServiceImpl<ChannelSupplierMapper, Chan
     @Override
     public void updateSupplierById(ChannelSupplier channelSupplier) {
         if (channelSupplier != null) {
-            channelSupplier.setUpdator("admin");
+            channelSupplier.setUpdator(SecurityUtil.getUser().getUsername());
             channelSupplier.setUpdateTime(new Date());
         }
         LambdaUpdateWrapper<ChannelSupplier> lambdaUpdateWrapper = new LambdaUpdateWrapper<>();
@@ -110,7 +111,7 @@ public class SupplierServiceImpl extends ServiceImpl<ChannelSupplierMapper, Chan
             if (channelSupplier.getSupplierId() == null) {
                 channelSupplier.setSupplierId(jedisCluster.incr(GLOBAL_ID_INCR.key()));
             }
-            channelSupplier.setCreator("admin");
+            channelSupplier.setCreator(SecurityUtil.getUser().getUsername());
             channelSupplier.setCreateTime(new Date());
             int result = baseMapper.insert(channelSupplier);
             if (result > 0) {

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

@@ -37,7 +37,7 @@
     </resultMap>
 
     <sql id="customerPayment">
-        pay.id  ,
+        pay.id,
         pay.card_no,
         pay.bank_deposit,
         pay.account,
@@ -69,7 +69,7 @@
 
 
     <sql id="supplerPayment">
-        pay.id  ,
+        pay.id,
         pay.card_no,
         pay.bank_deposit,
         pay.account,