Browse Source

充值列表-申请充值 添加 后补,备注字段

zhaoxian 2 years ago
parent
commit
8ea25b83ee

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

@@ -88,6 +88,12 @@ public class FinancePaymentRechargeApplicationServiceImpl extends ServiceImpl<Fi
         try {
             JSONArray list = data.getJSONArray("list");
             FinancePaymentRechargeApplication recharge = JSONObject.parseObject(JSONObject.toJSONString(data), FinancePaymentRechargeApplication.class);
+            List<String> advertiserIds = Arrays.asList(recharge.getAdvertiserId().split(","));
+            Advertiser advertiser = advertiserService.getById(advertiserIds.get(0));
+            if (!Check.isNull(advertiser)) {
+                recharge.setAdvertiserName(advertiser.getName());
+                data.put("advertiserName", advertiser.getName());
+            }
             FinancePaymentPool pool = financePaymentPoolService.getIdByUniqueKey(recharge.getAdvertiserName(), recharge.getProductId(), recharge.getPaymentMedia());
             if (Check.isNull(pool) || Check.isNull(list)) {
                 return Result.error("数据异常");
@@ -101,12 +107,6 @@ public class FinancePaymentRechargeApplicationServiceImpl extends ServiceImpl<Fi
                 recharge.setProductName(product.getProductName());
                 data.put("productName", product.getProductName());
             }
-            List<String> advertiserIds = Arrays.asList(recharge.getAdvertiserId().split(","));
-            Advertiser advertiser = advertiserService.getById(advertiserIds.get(0));
-            if (!Check.isNull(advertiser)) {
-                recharge.setAdvertiserName(advertiser.getName());
-                data.put("advertiserName", advertiser.getName());
-            }
             Project project = projectService.getById(recharge.getProjectId());
             if (!Check.isNull(project)) {
                 recharge.setProjectName(project.getProjectName());
@@ -168,6 +168,12 @@ 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());
+        List<String> advertiserIds = Arrays.asList(recharge.getAdvertiserId().split(","));
+        Advertiser advertiser = advertiserService.getById(advertiserIds.get(0));
+        if (!Check.isNull(advertiser)) {
+            recharge.setAdvertiserName(advertiser.getName());
+            data.put("advertiserName", advertiser.getName());
+        }
         FinancePaymentPool pool = financePaymentPoolService.getIdByUniqueKey(recharge.getAdvertiserName(), recharge.getProductId(), recharge.getPaymentMedia());
         if (Check.isNull(pool) || Check.isNull(list)) {
             return Result.error("数据异常");
@@ -181,12 +187,6 @@ public class FinancePaymentRechargeApplicationServiceImpl extends ServiceImpl<Fi
             recharge.setProductName(product.getProductName());
             data.put("productName", product.getProductName());
         }
-        List<String> advertiserIds = Arrays.asList(recharge.getAdvertiserId().split(","));
-        Advertiser advertiser = advertiserService.getById(advertiserIds.get(0));
-        if (!Check.isNull(advertiser)) {
-            recharge.setAdvertiserName(advertiser.getName());
-            data.put("advertiserName", advertiser.getName());
-        }
         Project project = projectService.getById(recharge.getProjectId());
         if (!Check.isNull(project)) {
             recharge.setProjectName(project.getProjectName());