浏览代码

Merge branch 'master' into test

zhaoxian 2 年之前
父节点
当前提交
3712e03899

+ 8 - 6
ruixuan-live/src/main/java/com/ruixuan/isc/controller/KuaishouItemCollectSamplesController.java

@@ -364,12 +364,14 @@ public class KuaishouItemCollectSamplesController extends BaseController {
                 String com = lastResult.getString("com");
                 if ("3".equals(state)) {
                     Integer status = kuaishouItemCollectSamplesService.getStatusByCourierNumbe(nu);
-                    if (status < 5) { // 防止快递重复回调
-                        KuaishouItemCollectSamples updateSample = new KuaishouItemCollectSamples();
-                        updateSample.setCourierNumber(nu);
-                        updateSample.setCollectSampleStatus(5);
-                        updateSample.setCollectSampleDesc("快递已签收,待上传作业");
-                        kuaishouItemCollectSamplesService.updateByNum(updateSample);
+                    if (!Check.isNull(status)) {
+                        if (status < 5) { // 防止快递重复回调
+                            KuaishouItemCollectSamples updateSample = new KuaishouItemCollectSamples();
+                            updateSample.setCourierNumber(nu);
+                            updateSample.setCollectSampleStatus(5);
+                            updateSample.setCollectSampleDesc("快递已签收,待上传作业");
+                            kuaishouItemCollectSamplesService.updateByNum(updateSample);
+                        }
                     }
                 }
                 JSONArray data = lastResult.getJSONArray("data");