add

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

@@ -65,6 +65,8 @@ public class GLPPGFWebsitServiceImpl implements GLPPGFWebsitService {
         insertTSWDInfoTM(record);
         // X9930000  其他电商
         insertTSWDInfoQT(record);
+        // S9329829 天猫优品
+        insertTSWDInfoTMYP(record);
     }
 
     @Override
@@ -120,171 +122,41 @@ public class GLPPGFWebsitServiceImpl implements GLPPGFWebsitService {
     }
 
     private void insertTSWDInfoJD(Brand record) {
-        BrandWebsit oldWebsitRec =  brandWebsitService.lambdaQuery()
-                .eq(BrandWebsit::getBrandWebsitNumber,"X9910000")
-                .eq(BrandWebsit::getType,InterFaceTypeEnum.XS_WEBSIT_TYPE.getCode())
-                .last("limit 1")
-                .one();
-        if (oldWebsitRec == null){
-            BrandWebsit v = new BrandWebsit();
-
-            v.setId(UUID.randomUUID().toString());
-            v.setBrandPkId(UUID.randomUUID().toString());
-            v.setBelongCompanyId(0);
-            v.setBelongCompany("X9910000");
-            v.setType(InterFaceTypeEnum.XS_WEBSIT_TYPE.getCode());
-            v.setBrandWebsitNumber("X9910000");
-            v.setBrandWebsitName("京东商城");
-            v.setFzren("/");
-            v.setYddh("4008365315");
-            v.setDhhm("4008365315");
-            v.setSfdlfr("否");
-            v.setLxren("/");
-            v.setFzrsfz("");
-            v.setShao("");
-            v.setKhyh("");
-            v.setHanghao("");
-            v.setYhzh("");
-            v.setSplb("");
-            v.setSplbmc("");
-            v.setFwlm("");
-            v.setWdjb("");
-            v.setSfdsqy("");
-            v.setFwrx("");
-            v.setStat("TOW");
-            v.setSfen("广东省");
-            v.setCshi("珠海市");
-            v.setXian("/");
-            v.setXzhen("/");
-            v.setDizi("珠海");
-            v.setBeiz("特殊网点");
-            v.setGroupCompanyId(record.getBrandId());
-            v.setGroupCompanyName(record.getBrand());
-            v.setCreateBy("system");
-            v.setUpdateBy("system");
-            v.setCreateTime(new Date());
-            v.setUpdateTime(new Date());
-
-            brandWebsitService.save(v);
-        }
+        extractedProcess(record, "X9910000", InterFaceTypeEnum.XS_WEBSIT_TYPE, "京东商城");
     }
 
     private void insertTSWDInfoTM(Brand record) {
-        BrandWebsit oldWebsitRec =  brandWebsitService.lambdaQuery()
-                .eq(BrandWebsit::getBrandWebsitNumber,"X9920000")
-                .eq(BrandWebsit::getType,InterFaceTypeEnum.XS_WEBSIT_TYPE.getCode())
-                .last("limit 1")
-                .one();
-        if (oldWebsitRec == null){
-            BrandWebsit v = new BrandWebsit();
-
-            v.setId(UUID.randomUUID().toString());
-            v.setBrandPkId(UUID.randomUUID().toString());
-            v.setBelongCompanyId(0);
-            v.setBelongCompany("X9920000");
-            v.setType(InterFaceTypeEnum.XS_WEBSIT_TYPE.getCode());
-            v.setBrandWebsitNumber("X9920000");
-            v.setBrandWebsitName("天猫商城");
-            v.setFzren("/");
-            v.setYddh("4008365315");
-            v.setDhhm("4008365315");
-            v.setSfdlfr("否");
-            v.setLxren("/");
-            v.setFzrsfz("");
-            v.setShao("");
-            v.setKhyh("");
-            v.setHanghao("");
-            v.setYhzh("");
-            v.setSplb("");
-            v.setSplbmc("");
-            v.setFwlm("");
-            v.setWdjb("");
-            v.setSfdsqy("");
-            v.setFwrx("");
-            v.setStat("TOW");
-            v.setSfen("广东省");
-            v.setCshi("珠海市");
-            v.setXian("/");
-            v.setXzhen("/");
-            v.setDizi("珠海");
-            v.setBeiz("特殊网点");
-            v.setGroupCompanyId(record.getBrandId());
-            v.setGroupCompanyName(record.getBrand());
-            v.setCreateBy("system");
-            v.setUpdateBy("system");
-            v.setCreateTime(new Date());
-            v.setUpdateTime(new Date());
+        extractedProcess(record, "X9920000", InterFaceTypeEnum.XS_WEBSIT_TYPE, "天猫商城");
+    }
 
-            brandWebsitService.save(v);
-        }
+    private void insertTSWDInfoTMYP(Brand record) {
+        extractedProcess(record, "S9329829", InterFaceTypeEnum.SH_WEBSIT_TYPE, "天猫优品");
     }
 
     private void insertTSWDInfoQT(Brand record) {
-        BrandWebsit oldWebsitRec =  brandWebsitService.lambdaQuery()
-                .eq(BrandWebsit::getBrandWebsitNumber,"X9930000")
-                .eq(BrandWebsit::getType,InterFaceTypeEnum.XS_WEBSIT_TYPE.getCode())
-                .last("limit 1")
-                .one();
-        if (oldWebsitRec == null){
-            BrandWebsit v = new BrandWebsit();
-
-            v.setId(UUID.randomUUID().toString());
-            v.setBrandPkId(UUID.randomUUID().toString());
-            v.setBelongCompanyId(0);
-            v.setBelongCompany("X9930000");
-            v.setType(InterFaceTypeEnum.XS_WEBSIT_TYPE.getCode());
-            v.setBrandWebsitNumber("X9930000");
-            v.setBrandWebsitName("其他商城");
-            v.setFzren("/");
-            v.setYddh("4008365315");
-            v.setDhhm("4008365315");
-            v.setSfdlfr("否");
-            v.setLxren("/");
-            v.setFzrsfz("");
-            v.setShao("");
-            v.setKhyh("");
-            v.setHanghao("");
-            v.setYhzh("");
-            v.setSplb("");
-            v.setSplbmc("");
-            v.setFwlm("");
-            v.setWdjb("");
-            v.setSfdsqy("");
-            v.setFwrx("");
-            v.setStat("TOW");
-            v.setSfen("广东省");
-            v.setCshi("珠海市");
-            v.setXian("/");
-            v.setXzhen("/");
-            v.setDizi("珠海");
-            v.setBeiz("特殊网点");
-            v.setGroupCompanyId(record.getBrandId());
-            v.setGroupCompanyName(record.getBrand());
-            v.setCreateBy("system");
-            v.setUpdateBy("system");
-            v.setCreateTime(new Date());
-            v.setUpdateTime(new Date());
-
-            brandWebsitService.save(v);
-        }
+        extractedProcess(record, "X9930000", InterFaceTypeEnum.XS_WEBSIT_TYPE, "其他商城");
     }
 
     private void insertTSWDInfo(Brand record) {
-        BrandWebsit oldWebsitRec =  brandWebsitService.lambdaQuery()
-                .eq(BrandWebsit::getBrandWebsitNumber,"99999999")
-                .eq(BrandWebsit::getType,InterFaceTypeEnum.XS_WEBSIT_TYPE.getCode())
+        extractedProcess(record, "99999999", InterFaceTypeEnum.XS_WEBSIT_TYPE, "格力总部");
+    }
+
+    private void extractedProcess(Brand record, String s, InterFaceTypeEnum xsWebsitType, String 格力总部) {
+        BrandWebsit oldWebsitRec = brandWebsitService.lambdaQuery()
+                .eq(BrandWebsit::getBrandWebsitNumber, s)
+                .eq(BrandWebsit::getType, xsWebsitType.getCode())
                 .last("limit 1")
                 .one();
-        if (oldWebsitRec == null){
+        if (oldWebsitRec == null) {
             BrandWebsit v = new BrandWebsit();
 
             v.setId(UUID.randomUUID().toString());
             v.setBrandPkId(UUID.randomUUID().toString());
             v.setBelongCompanyId(0);
-            v.setBelongCompany("99999999");
-            v.setType(InterFaceTypeEnum.XS_WEBSIT_TYPE.getCode());
-            v.setBrandWebsitNumber("99999999");
-            v.setBrandWebsitName("格力总部");
+            v.setBelongCompany(s);
+            v.setType(xsWebsitType.getCode());
+            v.setBrandWebsitNumber(s);
+            v.setBrandWebsitName(格力总部);
             v.setFzren("/");
             v.setYddh("4008365315");
             v.setDhhm("4008365315");

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

@@ -209,6 +209,7 @@ public class InstallProduceDataUploadServiceImpl implements InstallProduceDataUp
                                     continue;
                                 }
                             } else if (uploadTaskType==221 || uploadTaskType==222){
+                                // 报完工这里执行
                                 cjOrWg="cj";
                                 if (uploadTaskType==222) {
                                     cjOrWg = "wg";

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

@@ -862,6 +862,10 @@ public class PublicServiceImpl implements PublicService {
 
     @Override
     public Boolean addFaOrderSms(OrderReAppointment rea){
+        // 改约需要审核通过才可以发短信(平台直接写表，这里只操作预约发送写表)
+        if (rea.getFlag().equals(0)){
+            return Boolean.TRUE;
+        }
         OrderBase orderBase = orderbaseService.lambdaQuery()
                 .eq(OrderBase::getId,rea.getOrderBaseId())
                 .last("limit 1")

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

@@ -1680,6 +1680,10 @@ public class RepairProduceDataUploadServiceImpl implements RepairProduceDataUplo
         request.setId(detail.getId());
         request.setBrandId(brand.getBrandId());
         ItfTblWxjsJyktUpload jykt = detailOrderRepairMapper.getItfTblWxjsJyktUpload(request);
+        // 这里可以填写一个自生成的值
+        if (StringUtils.isEmpty(jykt.getPgmxid())){
+            jykt.setPgmxid(IdWorker.getIdStr());
+        }
         // 售后网点处理
         websitSH = publicService.ptshwdToshshwd(orderBase.getWebsitId(),orderBase.getMainId());
         jykt.setAzwdbh(websitSH.getWdId());

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

@@ -293,6 +293,7 @@ public class RepairProduceUploadListServiceImpl implements RepairProduceUploadLi
             OutJiasmToGreeUploadTaskList add = publicService.getUploadTaskList(item.getOrderNo(), item.getId(),
                     rea.getCreateTime(), itemTableName, itemOrderType, 230);
             outJiasmToGreeUploadTaskListService.save(add);
+
             // 向发短信表插入一条数据，短信表ID同预约改约表ID相同
             publicService.addFaOrderSms(rea);
         }

src/main/resources/bootstrap-dev.properties

@@ -73,7 +73,7 @@ web.imageService=https://xxxxx
 #高德
 lbs.web.key=b772f8b0ace6bc96c04ae8e48f241e36
 #家盛茂创建工单
-jiasmorderurl=https://jiasm.zfire.top/pcapi/order/add
+jiasmorderurl=https://jiasm.zfire.top/pcapi/order/tmp/add
 
 
 #####################redis 单机版 start################

src/main/resources/bootstrap-prd.properties

@@ -64,7 +64,7 @@ web.imageService=https://xxxxx
 #高德
 lbs.web.key=b772f8b0ace6bc96c04ae8e48f241e36
 #家盛茂创建工单
-jiasmorderurl=https://fw.gd-jxm.com/gateway/pcapi/order/add
+jiasmorderurl=https://jiasm.zfire.top/pcapi/order/tmp/add
 
 #####################redis 单机版 start################
 spring.redis.port=6379

src/main/resources/bootstrap-test.properties

@@ -74,7 +74,7 @@ web.imageService=https://xxxxx
 #高德
 lbs.web.key=b772f8b0ace6bc96c04ae8e48f241e36
 #家盛茂创建工单
-jiasmorderurl=https://jiasm.zfire.top/pcapi/order/add
+jiasmorderurl=https://jiasm.zfire.top/pcapi/order/tmp/add
 
 
 #####################redis 单机版 start################