瀏覽代碼

垫款相关 修改bug

zhaoxian 2 年之前
父節點
當前提交
6a2ea0e216

+ 2 - 2
jeecg-boot-module-system/src/main/java/cn/com/ctop/finance/payment/controller/FinancePaymentPoolController.java

@@ -185,8 +185,8 @@ public class FinancePaymentPoolController {
      * 查询信息
      */
     @GetMapping(value = "/queryPool")
-    public Result<Object> queryPoolAmount(String advertiserId, Long productId, String type) {
-        return financePaymentPoolService.queryPoolAmount(advertiserId, productId, type);
+    public Result<Object> queryPoolAmountById(String advertiserId, Long productId, String type) {
+        return financePaymentPoolService.queryPoolAmountById(advertiserId, productId, type);
     }
 
     /**

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

@@ -21,5 +21,8 @@ public interface FinancePaymentPoolMapper extends BaseMapper<FinancePaymentPool>
 
     List<JSONObject> queryIdAndName(Map<String, Object> map);
 
-    List<JSONObject> queryPoolProjectList(@Param("advertiserIds") List<String> advertiserIds,@Param("productId") Long productId,@Param("type") String type);
+    List<JSONObject> queryPoolProjectList(@Param("advertiserIds") List<String> advertiserIds, @Param("productId") Long productId, @Param("type") String type);
+
+    FinancePaymentPool queryFinancePaymentPoolById(@Param("advertiserId") String advertiserId, @Param("productId") Long productId, @Param("paymentMedia") String paymentMedia);
+
 }

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

@@ -21,6 +21,25 @@
           AND payment_media = #{paymentMedia}
     </select>
 
+    <select id="queryFinancePaymentPoolById" resultType="cn.com.ctop.finance.payment.entity.FinancePaymentPool">
+        SELECT id,
+               advertiser_id,
+               advertiser_name,
+               product_id,
+               product_name,
+               payment_type,
+               payment_media,
+               payment_port,
+               cash_amount,
+               display_amount,
+               rebate_type,
+               rebate_rate
+        FROM finance_payment_pool
+        WHERE advertiser_id = #{advertiserId}
+          AND product_id = #{productId}
+          AND payment_media = #{paymentMedia}
+    </select>
+
     <select id="queryIdAndName" resultType="com.alibaba.fastjson.JSONObject">
         select ${id} as 'id', ${name} as 'name'
         from ${table}

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

@@ -18,13 +18,13 @@ public interface IFinancePaymentPoolService extends IService<FinancePaymentPool>
 
     void add(FinancePaymentRechargeApplication oldRecharge, FinancePaymentApplication oldApplication);
 
-    FinancePaymentPool getIdByUniqueKey(String advertiserId, Long productId, String paymentMedia);
+    FinancePaymentPool getIdByUniqueKey(String advertiserName, Long productId, String paymentMedia);
 
     Result<Object> querySheetIdAndNameList(JSONObject data);
 
     void reduce(FinancePaymentRechargeApplication oldRecharge, FinancePaymentApplication oldApplication);
 
-    Result<Object> queryPoolAmount(String advertiserId, Long productId, String type);
-
     Result<Object> queryPoolProjectList(String advertiserId, Long productId, String type);
+
+    Result<Object> queryPoolAmountById(String advertiserId, Long productId, String type);
 }

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

@@ -65,8 +65,8 @@ public class FinancePaymentPoolServiceImpl extends ServiceImpl<FinancePaymentPoo
     }
 
     @Override
-    public FinancePaymentPool getIdByUniqueKey(String advertiserId, Long productId, String paymentMedia) {
-        return baseMapper.queryFinancePaymentPool(advertiserId, productId, paymentMedia);
+    public FinancePaymentPool getIdByUniqueKey(String advertiserName, Long productId, String paymentMedia) {
+        return baseMapper.queryFinancePaymentPool(advertiserName, productId, paymentMedia);
     }
 
     @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.getAdvertiserId(), recharge.getProductId(), recharge.getPaymentMedia());
+            FinancePaymentPool pool = baseMapper.queryFinancePaymentPool(recharge.getAdvertiserName(), recharge.getProductId(), recharge.getPaymentMedia());
             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.getAdvertiserId(), application.getProductId(), application.getPaymentMedia());
+            FinancePaymentPool pool = baseMapper.queryFinancePaymentPool(application.getAdvertiserName(), application.getProductId(), application.getPaymentMedia());
             if (!Check.isNull(pool)) {
                 BigDecimal cashAmount = pool.getCashAmount();
                 BigDecimal displayAmount = pool.getDisplayAmount();
@@ -111,13 +111,13 @@ public class FinancePaymentPoolServiceImpl extends ServiceImpl<FinancePaymentPoo
     }
 
     @Override
-    public Result<Object> queryPoolAmount(String advertiserId, Long productId, String type) {
-        return Result.ok(baseMapper.queryFinancePaymentPool(advertiserId, productId, type));
-    }
-
-    @Override
     public Result<Object> queryPoolProjectList(String advertiserId, Long productId, String type) {
         List<String> advertiserIds = Arrays.asList(advertiserId.split(","));
         return Result.ok(baseMapper.queryPoolProjectList(advertiserIds, productId, type));
     }
+
+    @Override
+    public Result<Object> queryPoolAmountById(String advertiserId, Long productId, String type) {
+        return Result.ok(baseMapper.queryFinancePaymentPoolById(advertiserId, productId, type));
+    }
 }

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

@@ -88,7 +88,7 @@ public class FinancePaymentRechargeApplicationServiceImpl extends ServiceImpl<Fi
         try {
             JSONArray list = data.getJSONArray("list");
             FinancePaymentRechargeApplication recharge = JSONObject.parseObject(JSONObject.toJSONString(data), FinancePaymentRechargeApplication.class);
-            FinancePaymentPool pool = financePaymentPoolService.getIdByUniqueKey(recharge.getAdvertiserId(), recharge.getProductId(), recharge.getPaymentMedia());
+            FinancePaymentPool pool = financePaymentPoolService.getIdByUniqueKey(recharge.getAdvertiserName(), recharge.getProductId(), recharge.getPaymentMedia());
             if (Check.isNull(pool) || Check.isNull(list)) {
                 return Result.error("数据异常");
             }
@@ -168,7 +168,7 @@ public class FinancePaymentRechargeApplicationServiceImpl extends ServiceImpl<Fi
         JSONArray list = data.getJSONArray("list");
         FinancePaymentRechargeApplication recharge = JSONObject.parseObject(JSONObject.toJSONString(data), FinancePaymentRechargeApplication.class);
         FinancePaymentRechargeApplication oldRecharge = this.getById(recharge.getId());
-        FinancePaymentPool pool = financePaymentPoolService.getIdByUniqueKey(recharge.getAdvertiserId(), recharge.getProductId(), recharge.getPaymentMedia());
+        FinancePaymentPool pool = financePaymentPoolService.getIdByUniqueKey(recharge.getAdvertiserName(), recharge.getProductId(), recharge.getPaymentMedia());
         if (Check.isNull(pool) || Check.isNull(list)) {
             return Result.error("数据异常");
         }