Merge remote-tracking branch 'origin/developer' into developer

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/outer/impl/InternationalSmsRecordApiServiceImpl.java

@@ -99,14 +99,20 @@ public class InternationalSmsRecordApiServiceImpl implements InternationalSmsRec
         logger.info("海外短信数据库扣费：{}", arg);
         InternationalSmsRecordDTO internationalSmsRecordDTO = JSON.parseObject(arg, InternationalSmsRecordDTO.class);
         internationalSmsRecordDTO.setDeductionTime(new Date());
-        // 应用名字
-        internationalSmsRecordDTO.setAppName(SmsAppEnum.getNameByCode(internationalSmsRecordDTO.getAppCode()));
-        // 会员名字
-        setMemberName(internationalSmsRecordDTO);
-        // 操作人
-        setUserName(internationalSmsRecordDTO);
-        // 门店
-        setStore(internationalSmsRecordDTO);
+
+        try {
+            // 应用名字
+            internationalSmsRecordDTO.setAppName(SmsAppEnum.getNameByCode(internationalSmsRecordDTO.getAppCode()));
+            // 会员名字
+            setMemberName(internationalSmsRecordDTO);
+            // 操作人
+            setUserName(internationalSmsRecordDTO);
+            // 门店
+            setStore(internationalSmsRecordDTO);
+        } catch (Exception e) {
+            logger.warn("错误", e);
+        }
+
         billingAccountService.deductAccountByDatabase(internationalSmsRecordDTO.getFee(), internationalSmsRecordDTO.getEnterpriseId());
         billingInternationalSmsRecordService.updateDatabaseStatus(internationalSmsRecordDTO);
         return ServiceResponse.success();

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/outer/impl/SmsRecordApiServiceImpl.java

@@ -180,16 +180,21 @@ public class SmsRecordApiServiceImpl implements SmsRecordApiService {
     public ServiceResponse<Void> executeDatabase(String arg) {
         logger.info("国内短信数据库扣费：{}", arg);
         SmsRecordDTO smsRecordDTO = JSON.parseObject(arg, SmsRecordDTO.class);
+
         // 扣费时间
         smsRecordDTO.setDeductionTime(new Date());
-        // 应用名字
-        smsRecordDTO.setAppName(SmsAppEnum.getNameByCode(smsRecordDTO.getAppCode()));
-        // 会员名字
-        setMemberName(smsRecordDTO);
-        // 操作人
-        setUserName(smsRecordDTO);
-        // 门店
-        setStore(smsRecordDTO);
+        try {
+            // 应用名字
+            smsRecordDTO.setAppName(SmsAppEnum.getNameByCode(smsRecordDTO.getAppCode()));
+            // 会员名字
+            setMemberName(smsRecordDTO);
+            // 操作人
+            setUserName(smsRecordDTO);
+            // 门店
+            setStore(smsRecordDTO);
+        } catch (Exception e) {
+            logger.warn("错误", e);
+        }
 
         Integer deductType = smsRecordDTO.getPayType();
         if (deductType.intValue() == DeductTypeEnum.PACKAGE.getType().intValue()) {