yumeng 2 years ago
parent
commit
00993f70ed

+ 24 - 5
ruixuan-live/src/main/java/com/ruixuan/isc/controller/KuaishouItemCollectSamplesController.java

@@ -82,8 +82,7 @@ public class KuaishouItemCollectSamplesController extends BaseController {
      */
      */
     @GetMapping("/list")
     @GetMapping("/list")
     public TableDataInfo list(Long itemId, Long promoterId, Long userId, Integer collectSampleStatus, String itemTitle, String promoterNickName, String promoterPhone,
     public TableDataInfo list(Long itemId, Long promoterId, Long userId, Integer collectSampleStatus, String itemTitle, String promoterNickName, String promoterPhone,
-                              String consignee, Long itemCreateId, Long collectSampleId, String fieId, String sort
-    ) {
+                              String consignee, Long itemCreateId, Long collectSampleId, String courierNumber, String collectSampleDesc, String fieId, String sort) {
         TableDataInfo tableDataInfo = new TableDataInfo();
         TableDataInfo tableDataInfo = new TableDataInfo();
         try {
         try {
             Map<String, Object> requestMap = new HashMap<>();
             Map<String, Object> requestMap = new HashMap<>();
@@ -146,6 +145,12 @@ public class KuaishouItemCollectSamplesController extends BaseController {
             if (!Check.isNull(collectSampleId)) {
             if (!Check.isNull(collectSampleId)) {
                 requestMap.put("collectSampleId", collectSampleId);
                 requestMap.put("collectSampleId", collectSampleId);
             }
             }
+            if (!Check.isNull(courierNumber)) {
+                requestMap.put("courierNumber", courierNumber);
+            }
+            if (!Check.isNull(collectSampleDesc)) {
+                requestMap.put("collectSampleDesc", collectSampleDesc);
+            }
             if (!Check.isNull(fieId)) {
             if (!Check.isNull(fieId)) {
                 requestMap.put("fieId", fieId);
                 requestMap.put("fieId", fieId);
             }
             }
@@ -288,6 +293,9 @@ public class KuaishouItemCollectSamplesController extends BaseController {
             }
             }
             String courierNumber = kuaishouItemCollectSamples.getCourierNumber();
             String courierNumber = kuaishouItemCollectSamples.getCourierNumber();
             if (!Check.isNull(courierNumber)) {
             if (!Check.isNull(courierNumber)) {
+                if (courierNumber.contains(" ") || courierNumber.contains(".") || courierNumber.contains("、") || courierNumber.contains(",") || courierNumber.contains("@") || courierNumber.contains("#")) {
+                    throw new Exception("快递单号不能包含空格及特殊字符");
+                }
                 sampleLog.setCollectSampleStatus(4);
                 sampleLog.setCollectSampleStatus(4);
                 kuaishouItemCollectSamples.setCollectSampleStatus(4);
                 kuaishouItemCollectSamples.setCollectSampleStatus(4);
                 kuaishouItemCollectSamples.setCollectSampleDesc("商品已发货");
                 kuaishouItemCollectSamples.setCollectSampleDesc("商品已发货");
@@ -397,6 +405,10 @@ public class KuaishouItemCollectSamplesController extends BaseController {
             if (Check.isNull(companyCode)) {
             if (Check.isNull(companyCode)) {
                 throw new Exception("公司编号不能为空");
                 throw new Exception("公司编号不能为空");
             }
             }
+
+            if (courierNumber.contains(" ") || courierNumber.contains(".") || courierNumber.contains("、") || courierNumber.contains(",") || courierNumber.contains("@") || courierNumber.contains("#")) {
+                throw new Exception("快递单号不能包含空格及特殊字符");
+            }
             KuaishouItemCollectSamples kuaishouItemCollectSamples = new KuaishouItemCollectSamples();
             KuaishouItemCollectSamples kuaishouItemCollectSamples = new KuaishouItemCollectSamples();
             kuaishouItemCollectSamples.setId(id);
             kuaishouItemCollectSamples.setId(id);
             kuaishouItemCollectSamples.setCourierNumber(courierNumber);
             kuaishouItemCollectSamples.setCourierNumber(courierNumber);
@@ -498,10 +510,12 @@ public class KuaishouItemCollectSamplesController extends BaseController {
                 String state = lastResult.getString("state");
                 String state = lastResult.getString("state");
                 String nu = lastResult.getString("nu");
                 String nu = lastResult.getString("nu");
                 String com = lastResult.getString("com");
                 String com = lastResult.getString("com");
+                String status = lastResult.getString("status");
+                String message = lastResult.getString("message");
                 if ("3".equals(state)) {
                 if ("3".equals(state)) {
-                    Integer status = kuaishouItemCollectSamplesService.getStatusByCourierNumbe(nu);
-                    if (!Check.isNull(status)) {
-                        if (status < 5) { // 防止快递重复回调
+                    Integer sampleStatus = kuaishouItemCollectSamplesService.getStatusByCourierNumbe(nu);
+                    if (!Check.isNull(sampleStatus)) {
+                        if (sampleStatus < 5) { // 防止快递重复回调
                             KuaishouItemCollectSamples updateSample = new KuaishouItemCollectSamples();
                             KuaishouItemCollectSamples updateSample = new KuaishouItemCollectSamples();
                             updateSample.setCourierNumber(nu);
                             updateSample.setCourierNumber(nu);
                             updateSample.setCollectSampleStatus(5);
                             updateSample.setCollectSampleStatus(5);
@@ -509,6 +523,11 @@ public class KuaishouItemCollectSamplesController extends BaseController {
                             kuaishouItemCollectSamplesService.updateByNum(updateSample);
                             kuaishouItemCollectSamplesService.updateByNum(updateSample);
                         }
                         }
                     }
                     }
+                } else if ("0".equals(state) && "abort".equals(status) && message.contains("无记录")) {
+                    KuaishouItemCollectSamples updateSample = new KuaishouItemCollectSamples();
+                    updateSample.setCourierNumber(nu);
+                    updateSample.setCollectSampleDesc("单号异常");
+                    kuaishouItemCollectSamplesService.updateByNum(updateSample);
                 }
                 }
                 JSONArray data = lastResult.getJSONArray("data");
                 JSONArray data = lastResult.getJSONArray("data");
                 KuaishouItemCollectSampleExpress express = new KuaishouItemCollectSampleExpress();
                 KuaishouItemCollectSampleExpress express = new KuaishouItemCollectSampleExpress();

+ 6 - 0
ruixuan-live/src/main/resources/mapper/isc/KuaishouItemCollectSamplesMapper.xml

@@ -151,6 +151,12 @@
             <if test="collectSampleId != null and collectSampleId != ''">
             <if test="collectSampleId != null and collectSampleId != ''">
                 and t1.collect_sample_id = #{collectSampleId}
                 and t1.collect_sample_id = #{collectSampleId}
             </if>
             </if>
+            <if test="courierNumber != null and courierNumber != ''">
+                and t1.courier_number = #{courierNumber}
+            </if>
+            <if test="collectSampleDesc != null and collectSampleDesc != ''">
+                and t1.collect_sample_desc = #{collectSampleDesc}
+            </if>
         </where>
         </where>
         order by ${fieId} ${sort}
         order by ${fieId} ${sort}
     </select>
     </select>