浏览代码

Merge remote-tracking branch 'origin/master'

yumeng 9 月之前
父节点
当前提交
ac9135165e

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

@@ -62,7 +62,7 @@ public class FinancePaymentRechargeAccount {
      */
     @Excel(name = "账户id", width = 15)
     @ApiModelProperty(value = "账户id")
-    private Long accountId;
+    private String accountId;
     /**
      * 账户名
      */

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

@@ -134,7 +134,7 @@ public class FinancePaymentRechargeApplicationServiceImpl extends ServiceImpl<Fi
                 FinancePaymentRechargeAccount account = new FinancePaymentRechargeAccount();
                 account.setRechargeId(recharge.getId());
                 account.setProjectId(recharge.getProjectId());
-                account.setAccountId(obj.getLong("accountId"));
+                account.setAccountId(obj.getString("accountId"));
                 UserAllocation allocation = userAllocationService.getByAccountId(obj.getLong("accountId"));
                 if (!Check.isNull(allocation)) {
                     account.setAccountName(allocation.getAuthName());
@@ -235,7 +235,7 @@ public class FinancePaymentRechargeApplicationServiceImpl extends ServiceImpl<Fi
             FinancePaymentRechargeAccount account = new FinancePaymentRechargeAccount();
             account.setRechargeId(recharge.getId());
             account.setProjectId(recharge.getProjectId());
-            account.setAccountId(obj.getLong("accountId"));
+            account.setAccountId(obj.getString("accountId"));
             UserAllocation acco = userAllocationService.getByAccountId(obj.getLong("accountId"));
             if (!Check.isNull(acco)) {
                 account.setAccountName(acco.getAuthName());

+ 6 - 2
jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/DelKuaiShouVideoGetServiceImpl.java

@@ -114,8 +114,12 @@ public class DelKuaiShouVideoGetServiceImpl extends ServiceImpl<DelKuaiShouVideo
 
     @Override
     public void getCreateInfo(Long accountId, String photoName) {
-        List<String> phototIds = videoGetMapper.queryPhototIdsByPhotoName(accountId, photoName);
-        videoRelateCreatives(accountId, phototIds);
+        try {
+            List<String> phototIds = videoGetMapper.queryPhototIdsByPhotoName(accountId, photoName);
+            videoRelateCreatives(accountId, phototIds);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
     }
 
     public void videoRelateCreatives(Long accountId, List<String> photoIds) {