Explorar o código

垫款功能,添加端口类型逻辑

zhaoxian %!s(int64=2) %!d(string=hai) anos
pai
achega
0d447b056d

+ 6 - 0
jeecg-boot-module-system/src/main/java/cn/com/ctop/finance/payment/entity/FinancePaymentRechargeApplication.java

@@ -66,6 +66,12 @@ public class FinancePaymentRechargeApplication {
     @ApiModelProperty(value = "项目id")
     private Long projectId;
     /**
+     * 端口类型:1-汇创、2-骄阳、3-江西五七、4-北京五六七
+     */
+    @Excel(name = "端口类型:1-汇创、2-骄阳、3-江西五七、4-北京五六七", width = 15)
+    @ApiModelProperty(value = "端口类型:1-汇创、2-骄阳、3-江西五七、4-北京五六七")
+    private String paymentPort;
+    /**
      * 项目名称
      */
     @Excel(name = "项目名称", width = 15)

+ 1 - 1
jeecg-boot-module-system/src/main/java/cn/com/ctop/finance/payment/mapper/FinancePaymentPoolMapper.java

@@ -17,7 +17,7 @@ import java.util.Map;
  */
 public interface FinancePaymentPoolMapper extends BaseMapper<FinancePaymentPool> {
 
-    FinancePaymentPool queryFinancePaymentPool(@Param("advertiserName") String advertiserName, @Param("productId") Long productId, @Param("paymentMedia") String paymentMedia);
+    FinancePaymentPool queryFinancePaymentPool(@Param("advertiserName") String advertiserName, @Param("productId") Long productId, @Param("paymentMedia") String paymentMedia, @Param("paymentPort") String paymentPort);
 
     List<JSONObject> queryIdAndName(Map<String, Object> map);
 

+ 2 - 0
jeecg-boot-module-system/src/main/java/cn/com/ctop/finance/payment/mapper/xml/FinancePaymentPoolMapper.xml

@@ -19,6 +19,8 @@
         WHERE advertiser_name = #{advertiserName}
           AND product_id = #{productId}
           AND payment_media = #{paymentMedia}
+          AND payment_port = #{paymentPort}
+
     </select>
 
     <select id="queryFinancePaymentPoolById" resultType="cn.com.ctop.finance.payment.entity.FinancePaymentPool">

+ 1 - 1
jeecg-boot-module-system/src/main/java/cn/com/ctop/finance/payment/service/IFinancePaymentPoolService.java

@@ -18,7 +18,7 @@ public interface IFinancePaymentPoolService extends IService<FinancePaymentPool>
 
     void add(FinancePaymentRechargeApplication oldRecharge, FinancePaymentApplication oldApplication);
 
-    FinancePaymentPool getIdByUniqueKey(String advertiserName, Long productId, String paymentMedia);
+    FinancePaymentPool getIdByUniqueKey(String advertiserName, Long productId, String paymentMedia, String paymentPort);
 
     Result<Object> querySheetIdAndNameList(JSONObject data);
 

+ 6 - 6
jeecg-boot-module-system/src/main/java/cn/com/ctop/finance/payment/service/impl/FinancePaymentPoolServiceImpl.java

@@ -36,7 +36,7 @@ public class FinancePaymentPoolServiceImpl extends ServiceImpl<FinancePaymentPoo
     @Override
     public void add(FinancePaymentRechargeApplication recharge, FinancePaymentApplication application) {
         if (Check.isNull(recharge)) {
-            FinancePaymentPool pool = baseMapper.queryFinancePaymentPool(application.getAdvertiserName(), application.getProductId(), application.getPaymentMedia());
+            FinancePaymentPool pool = baseMapper.queryFinancePaymentPool(application.getAdvertiserName(), application.getProductId(), application.getPaymentMedia(), application.getPaymentPort());
             if (Check.isNull(pool)) {
                 FinancePaymentPool paymentPool = new FinancePaymentPool();
                 BeanUtil.copyProperties(application, paymentPool);
@@ -52,7 +52,7 @@ public class FinancePaymentPoolServiceImpl extends ServiceImpl<FinancePaymentPoo
                 this.updateById(pool);
             }
         } else {
-            FinancePaymentPool pool = baseMapper.queryFinancePaymentPool(recharge.getAdvertiserName(), recharge.getProductId(), recharge.getPaymentMedia());
+            FinancePaymentPool pool = baseMapper.queryFinancePaymentPool(recharge.getAdvertiserName(), recharge.getProductId(), recharge.getPaymentMedia(), recharge.getPaymentPort());
             if (!Check.isNull(pool)) {
                 JSONObject amounts = accountMapperl.queryAmounts(recharge.getId());
                 BigDecimal cashAmount = pool.getCashAmount();
@@ -65,8 +65,8 @@ public class FinancePaymentPoolServiceImpl extends ServiceImpl<FinancePaymentPoo
     }
 
     @Override
-    public FinancePaymentPool getIdByUniqueKey(String advertiserName, Long productId, String paymentMedia) {
-        return baseMapper.queryFinancePaymentPool(advertiserName, productId, paymentMedia);
+    public FinancePaymentPool getIdByUniqueKey(String advertiserName, Long productId, String paymentMedia, String paymentPort) {
+        return baseMapper.queryFinancePaymentPool(advertiserName, productId, paymentMedia, paymentPort);
     }
 
     @Override
@@ -88,7 +88,7 @@ public class FinancePaymentPoolServiceImpl extends ServiceImpl<FinancePaymentPoo
     @Override
     public void reduce(FinancePaymentRechargeApplication recharge, FinancePaymentApplication application) {
         if (Check.isNull(application)) {
-            FinancePaymentPool pool = baseMapper.queryFinancePaymentPool(recharge.getAdvertiserName(), recharge.getProductId(), recharge.getPaymentMedia());
+            FinancePaymentPool pool = baseMapper.queryFinancePaymentPool(recharge.getAdvertiserName(), recharge.getProductId(), recharge.getPaymentMedia(), recharge.getPaymentPort());
             if (!Check.isNull(pool)) {
                 JSONObject amounts = accountMapperl.queryAmounts(recharge.getId());
 
@@ -99,7 +99,7 @@ public class FinancePaymentPoolServiceImpl extends ServiceImpl<FinancePaymentPoo
                 this.updateById(pool);
             }
         } else {
-            FinancePaymentPool pool = baseMapper.queryFinancePaymentPool(application.getAdvertiserName(), application.getProductId(), application.getPaymentMedia());
+            FinancePaymentPool pool = baseMapper.queryFinancePaymentPool(application.getAdvertiserName(), application.getProductId(), application.getPaymentMedia(), application.getPaymentPort());
             if (!Check.isNull(pool)) {
                 BigDecimal cashAmount = pool.getCashAmount();
                 BigDecimal displayAmount = pool.getDisplayAmount();

+ 2 - 3
jeecg-boot-module-system/src/main/java/cn/com/ctop/finance/payment/service/impl/FinancePaymentRechargeApplicationServiceImpl.java

@@ -94,7 +94,7 @@ public class FinancePaymentRechargeApplicationServiceImpl extends ServiceImpl<Fi
                 recharge.setAdvertiserName(advertiser.getName());
                 data.put("advertiserName", advertiser.getName());
             }
-            FinancePaymentPool pool = financePaymentPoolService.getIdByUniqueKey(recharge.getAdvertiserName(), recharge.getProductId(), recharge.getPaymentMedia());
+            FinancePaymentPool pool = financePaymentPoolService.getIdByUniqueKey(recharge.getAdvertiserName(), recharge.getProductId(), recharge.getPaymentMedia(), recharge.getPaymentPort());
             if (Check.isNull(pool) || Check.isNull(list)) {
                 return Result.error("数据异常");
             }
@@ -174,7 +174,7 @@ public class FinancePaymentRechargeApplicationServiceImpl extends ServiceImpl<Fi
             recharge.setAdvertiserName(advertiser.getName());
             data.put("advertiserName", advertiser.getName());
         }
-        FinancePaymentPool pool = financePaymentPoolService.getIdByUniqueKey(recharge.getAdvertiserName(), recharge.getProductId(), recharge.getPaymentMedia());
+        FinancePaymentPool pool = financePaymentPoolService.getIdByUniqueKey(recharge.getAdvertiserName(), recharge.getProductId(), recharge.getPaymentMedia(), recharge.getPaymentPort());
         if (Check.isNull(pool) || Check.isNull(list)) {
             return Result.error("数据异常");
         }
@@ -254,7 +254,6 @@ public class FinancePaymentRechargeApplicationServiceImpl extends ServiceImpl<Fi
         if (Check.isNull(oldRecharge)) {
             return Result.error("未查询到申请");
         }
-        String reviewederId = oldRecharge.getReviewederId();
         String auditStatus = recharge.getAuditStatus();//1-待审核、2-待充值、3-充值完成、4-临时充值、5-审核拒绝
         if ("2".equals(auditStatus)) {
             recharge.setReviewederId("meidaManager");