feature 代码提交

zhsw-common/src/main/java/com/rongwei/zhsw/system/service/impl/BillGenerationServiceImpl.java

@@ -127,7 +127,7 @@ public class BillGenerationServiceImpl {
             // 校验 是否已存在抄表记录
             if (swWaterUsageEntry.getState().equals("1")) {
                 log.error("当前用户：{},时间：{}的抄表记录已生成账单信息", usernumber, currentreadingdate);
-                break;
+                continue;
             }
             swUserManagementDo = userMap.getOrDefault(swWaterUsageEntry.getUsernumber(), null);
 
@@ -137,7 +137,7 @@ public class BillGenerationServiceImpl {
                 log.error("当前户号不存在：{}", swWaterUsageEntry.getUsernumber());
                 usageEntryDo.setState("2");
                 saveUsageEntryList.add(usageEntryDo);
-                break;
+                continue;
             }
             // 校验是否可以生成账单
             if (swUserManagementDo.getLastmeterreaddate() != null &&
@@ -145,7 +145,7 @@ public class BillGenerationServiceImpl {
                 log.error("本次抄表日期:{}小于用户表最后一次抄表日期:{}", swUserManagementDo.getLastmeterreaddate(), swWaterUsageEntry.getCurrentreadingdate());
                 usageEntryDo.setState("3");
                 saveUsageEntryList.add(usageEntryDo);
-                break;
+                continue;
             }
             try {
                 // 生成代缴费账单

zhsw-common/src/main/java/com/rongwei/zhsw/system/wechat/impl/RegistrationServiceImpl.java

@@ -5,8 +5,10 @@ import com.rongwe.zhsw.system.domain.SwUserRepairDo;
 import com.rongwe.zhsw.system.vo.WeChatFeedbackReportVo;
 import com.rongwe.zhsw.system.vo.WeChatRepairReportVo;
 import com.rongwe.zhsw.system.vo.WeChatUploadVo;
+import com.rongwei.commonservice.service.SysConfigService;
 import com.rongwei.rwadmincommon.system.domain.SysUserDo;
 import com.rongwei.rwcommon.base.R;
+import com.rongwei.rwcommon.utils.Constants;
 import com.rongwei.rwcommon.utils.SecurityUtil;
 import com.rongwei.rwcommon.utils.StringUtils;
 import com.rongwei.rwcommoncomponent.file.dto.ImageScaleDto;
@@ -48,6 +50,8 @@ public class RegistrationServiceImpl implements RegistrationService {
     private SwFeedBackOpinionServiceImpl swFeedBackOpinionService;
     @Autowired
     private CommonBusinessDao commonBusinessDao;
+    @Autowired
+    private SysConfigService sysConfigService;
 
     /**
      * 用户保修
@@ -147,8 +151,9 @@ public class RegistrationServiceImpl implements RegistrationService {
 
 
     public SysFileItemDo imgSave(WeChatUploadVo weChatUploadVo, String id, String pathSuffix) {
+        String contentByConfigCode = sysConfigService.getContentByConfigCode(Constants.CONFIG_FILE_ROOT_PATH);
         String base64 = weChatUploadVo.getBase64();
-        String filePath = "/upload_files/" + pathSuffix + "/";
+        String filePath = contentByConfigCode + "/" + pathSuffix + "/";
         // 微信临时文件的目录
         String tempFilePath = weChatUploadVo.getTempFilePath();
         String fileName = tempFilePath.substring(tempFilePath.lastIndexOf("/") + 4);