add

src/main/java/com/zfire/jiasm/syncdata/service/impl/InstallProduceUploadListServiceImpl.java

@@ -57,10 +57,8 @@ public class InstallProduceUploadListServiceImpl implements InstallProduceUpload
         // 从需要上传的订单数据表中提取数据
         taskResults = outJiasmToGreeUploadnotifylistService.lambdaQuery()
                 .eq(OutJiasmToGreeUploadnotifylist::getSynStatus, SynStatusEnum.UN_SYN.getCode())
-                .orderByAsc(OutJiasmToGreeUploadnotifylist::getSynReqId).last("limit 5").list();
-
-        log.info("需要上传的工单数据: \uF0B7{}",taskResults.size());
-
+                .orderByAsc(OutJiasmToGreeUploadnotifylist::getSynReqId)
+                .list();
         try {
             for (OutJiasmToGreeUploadnotifylist item : taskResults) {
                 // 同步的表名
@@ -93,41 +91,27 @@ public class InstallProduceUploadListServiceImpl implements InstallProduceUpload
                             itemOrderType.equals(OrderTypeEnum.ORDER_TYPE_INSTALL.getCode())){
                         orderBaseProess(itemTableNameId, ojtgutls, item.getSynReqId(), itemTableName, itemOrderType);
                     }
-                    log.info("需要上传的工单数据 a ");
-
                     // 安装工单操作日志 23
                     if (itemTableName.equals("order_install_operating_log")){
                         orderInstallOperatingLog(item, itemTableName, itemOrderType);
                     }
-
-                    log.info("需要上传的工单数据 b ");
-
                     // 安装工单用户预约、改约明细 230 同时向发短信表插入一条数据
                     if (itemTableName.equals("order_re_appointment") &&
                             itemOrderType.equals(OrderTypeEnum.ORDER_TYPE_INSTALL.getCode())){
                         OrderReAppointment(item, itemTableName, itemOrderType);
                     }
-
-                    log.info("需要上传的工单数据 c ");
-
                     // 安装工单产品信息 24
                     if (itemTableName.equals("order_product") &&
                             itemOrderType.equals(OrderTypeEnum.ORDER_TYPE_INSTALL.getCode())){
                         // TL_PrePare_task_by_fa_order_install_product 24
                         orderProductProess(item, itemTableName, itemOrderNo, itemTableNameId);
                     }
-
-                    log.info("需要上传的工单数据 d ");
-
                     // 安装工单子信息  26
                     if (itemTableName.equals("order_information") &&
                             itemOrderType.equals(OrderTypeEnum.ORDER_TYPE_INSTALL.getCode())){
                         // TL_PrePare_task_by_fa_order_install_information
                         orderInformationProess(item, itemTableName, itemOrderNo, itemTableNameId);
                     }
-
-                    log.info("需要上传的工单数据 e ");
-
                 } catch (Exception ex) {
                     log.info("需要上传的工单数据 f ");
                     errorMessage = ex.getMessage();

src/main/java/com/zfire/jiasm/syncdata/service/impl/PublicServiceImpl.java

@@ -412,10 +412,12 @@ public class PublicServiceImpl implements PublicService {
     public String getfsma(String phone) {
         Random random = new Random(System.currentTimeMillis());
         String fsma="";
+        List<ItfMessagehuifangentity> r = new ArrayList<>();
 
 
         // 同一用户最近两个月内产生的发送码不能相同 itfMessagehuifangentityService
         while (Boolean.TRUE){
+            r.clear();
             fsma = String.valueOf(random.nextInt(10000));
             if (fsma.length()<4){
                 if (fsma.length()==3){
@@ -429,11 +431,12 @@ public class PublicServiceImpl implements PublicService {
             if (StringUtils.isEmpty(phone.trim())){
                 break;
             }
-            List<ItfMessagehuifangentity> r = itfMessagehuifangentityService.lambdaQuery()
+            r = itfMessagehuifangentityService.lambdaQuery()
                     .eq(ItfMessagehuifangentity::getSjid,phone)
                     .eq(ItfMessagehuifangentity::getFsma,fsma)
                     .ge(ItfMessagehuifangentity::getCrdt,stepMonth(new Date(),-2)).list();
             if (CollectionUtils.isEmpty(r)){
+                r.clear();
                 break;
             }
         }
@@ -782,7 +785,7 @@ public class PublicServiceImpl implements PublicService {
             return Boolean.TRUE;
         }
         // 一个工单只能有一次预约信息，改约可以多个
-        if (rea.getFlag()==1){
+        if (rea.getFlag().equals(1)){
             FaOrderSms r = faOrderSmsService.lambdaQuery()
                     .eq(FaOrderSms::getSynTaskNo,rea.getId())
                     .last("limit 1")
@@ -1425,8 +1428,10 @@ public class PublicServiceImpl implements PublicService {
     private String getFaOrderSmsfsma(String phone) {
         Random random = new Random(System.currentTimeMillis());
         String fsma="";
+        List<FaOrderSms> fos = new ArrayList<>();
         // 同一用户最近两个月内产生的发送码不能相同
         while (Boolean.TRUE){
+            fos.clear();
             fsma = String.valueOf(random.nextInt(10000));
             if (fsma.length()<4){
                 if (fsma.length()==3){
@@ -1437,11 +1442,12 @@ public class PublicServiceImpl implements PublicService {
                     fsma = fsma + "`999";
                 }
             }
-            List<FaOrderSms> r = faOrderSmsService.lambdaQuery()
+            fos = faOrderSmsService.lambdaQuery()
                     .eq(FaOrderSms::getSjid,phone)
                     .eq(FaOrderSms::getFsma,fsma)
                     .ge(FaOrderSms::getCrdt,stepMonth(new Date(),-2)).list();
-            if (CollectionUtils.isEmpty(r)){
+            if (CollectionUtils.isEmpty(fos)){
+                fos.clear();
                 break;
             }
         }
@@ -1464,7 +1470,8 @@ public class PublicServiceImpl implements PublicService {
         record.setPhone(rea.getUserMobile());
         if (record.getType()==1){
             record.setContent(String.format(ALISMS_RESERVE,
-                    sdf.format(rea.getOldAppointmentTime()),getSHWDPhone(rea.getWebsitId())));
+                    rea.getOldAppointmentTime()==null ? sdf.format(rea.getNewAppointmentTime()):sdf.format(rea.getOldAppointmentTime()),
+                    getSHWDPhone(rea.getWebsitId())));
         } else {
             record.setContent(String.format(ALISMS_RESERVE,
                     sdf.format(rea.getNewAppointmentTime()),getSHWDPhone(rea.getWebsitId())));

src/main/resources/bootstrap-dev.properties

@@ -288,7 +288,7 @@ workerceruploadc=FALSE
 detaildownc=FALSE
 #安装工单下载 、入本地表
 installdownc=FALSE
-installinc=TRUE
+installinc=FALSE
 #维修工单下载、入本地表
 repairdownc=FALSE
 repairinc=FALSE
@@ -313,7 +313,7 @@ masterdownloadratec=FALSE
 masterratec=FALSE
 guzdmc=FALSE
 #网点 佛山销售网点|售后网点、广州销售网点|售后网点
-netfsxc=TRUE
+netfsxc=FALSE
 netfssc=FALSE
 netgzxc=FALSE
 netgzsc=FALSE
@@ -380,8 +380,8 @@ glscc=FALSE
 #天猫商城
 tmscc=FALSE
 #安装工单上传  生成需要上传的数据、生成上传任务清单列表
-azuploadyscc=TRUE
-azuploadscc=FALSE
+azuploadyscc=FALSE
+azuploadscc=TRUE
 #维修工单上传  生成需要上传的数据、生成上传任务清单列表
 wxuploadyscc=FALSE
 wxuploadscc=FALSE