yumeng hai 1 ano
pai
achega
d8c379ec28

+ 40 - 0
ruixuan-live/src/main/java/com/ruixuan/isc/controller/KuaishouItemCollectSamplesController.java

@@ -302,6 +302,7 @@ public class KuaishouItemCollectSamplesController extends BaseController {
                 sampleLog.setCollectSampleStatus(4);
                 kuaishouItemCollectSamples.setCollectSampleStatus(4);
                 kuaishouItemCollectSamples.setCollectSampleDesc("商品已发货");
+                kuaishouItemCollectSamples.setCompanyCode(kuaishouItemCollectSamples.getCompanyCode());
                 kuaishouItemCollectSamples.setCourierNumberTime(new Date());
                 // 调用快递接口
                 kuaishouItemCollectSamplesService.subscribe(id, courierNumber, kuaishouItemCollectSamples.getCompanyCode());
@@ -416,6 +417,7 @@ public class KuaishouItemCollectSamplesController extends BaseController {
             kuaishouItemCollectSamples.setId(id);
             kuaishouItemCollectSamples.setCollectSampleDesc("商品已发货");
             kuaishouItemCollectSamples.setCourierNumber(courierNumber);
+            kuaishouItemCollectSamples.setCompanyCode(companyCode);
             kuaishouItemCollectSamples.setCourierNumberTime(new Date());
             int i = kuaishouItemCollectSamplesService.updateKuaishouItemCollectSamples(kuaishouItemCollectSamples);
             if (i > 0) {
@@ -432,6 +434,44 @@ public class KuaishouItemCollectSamplesController extends BaseController {
     }
 
 
+    @GetMapping("/refreshCourierNumber")
+    public JSONObject refreshCourierNumber(Long id, String courierNumber, String companyCode) {
+        log.info("刷新快递单号,id:{},courierNumber:{},companyCode:{}", id, courierNumber, companyCode);
+        JSONObject returnJson = new JSONObject();
+        try {
+            if (Check.isNull(id)) {
+                throw new Exception("id不能为空");
+            }
+            if (Check.isNull(courierNumber)) {
+                throw new Exception("快递单号不能为空");
+            }
+            if (Check.isNull(companyCode)) {
+                throw new Exception("公司编号不能为空");
+            }
+
+            if (courierNumber.contains(" ") || courierNumber.contains(".") || courierNumber.contains("、") || courierNumber.contains(",") || courierNumber.contains("@") || courierNumber.contains("#")) {
+                throw new Exception("快递单号不能包含空格及特殊字符");
+            }
+            KuaishouItemCollectSamples kuaishouItemCollectSamples = new KuaishouItemCollectSamples();
+            kuaishouItemCollectSamples.setId(id);
+            kuaishouItemCollectSamples.setCollectSampleDesc("商品已发货");
+            //  kuaishouItemCollectSamples.setCourierNumber(courierNumber);
+            // kuaishouItemCollectSamples.setCourierNumberTime(new Date());
+            int i = kuaishouItemCollectSamplesService.updateKuaishouItemCollectSamples(kuaishouItemCollectSamples);
+            if (i > 0) {
+                kuaishouItemCollectSamplesService.subscribe(id, courierNumber, companyCode);
+            }
+            returnJson.put("code", 0);
+            returnJson.put("message", "修改成功");
+        } catch (Exception e) {
+            e.printStackTrace();
+            returnJson.put("code", 500);
+            returnJson.put("message", e.getMessage());
+        }
+        return returnJson;
+    }
+
+
     @GetMapping("/detail")
     public JSONObject detail(Long id) {
         JSONObject returnJson = new JSONObject();

+ 0 - 1
ruixuan-live/src/main/java/com/ruixuan/isc/entity/KuaishouItemCollectSamples.java

@@ -160,7 +160,6 @@ public class KuaishouItemCollectSamples extends BaseEntity {
     private String collectSampleDesc;
 
 
-    @Transient
     private String companyCode;
     @Transient
     private Long userId;

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

@@ -28,6 +28,7 @@
         <result property="promoterAddress" column="promoter_address"/>
         <result property="consignee" column="consignee"/>
         <result property="courierNumber" column="courier_number"/>
+        <result property="companyCode" column="company_code"/>
         <result property="courierNumberTime" column="courier_number_time"/>
         <result property="taskFileUrl" column="task_file_url"/>
         <result property="collectSampleStatus" column="collect_sample_status"/>
@@ -63,6 +64,7 @@
                promoter_address,
                consignee,
                courier_number,
+               company_code,
                courier_number_time,
                task_file_url,
                collect_sample_status,
@@ -100,6 +102,7 @@
         t1.promoter_address,
         t1.consignee,
         t1.courier_number,
+        t1.company_code,
         t1.courier_number_time,
         t1.task_file_url,
         t1.collect_sample_status,
@@ -330,6 +333,7 @@
             <if test="promoterAddress != null">promoter_address,</if>
             <if test="consignee != null">consignee,</if>
             <if test="courierNumber != null">courier_number,</if>
+            <if test="companyCode != null">company_code,</if>
             <if test="courierNumberTime != null">courier_number_time,</if>
             <if test="taskFileUrl != null">task_file_url,</if>
             <if test="collectSampleStatus != null">collect_sample_status,</if>
@@ -363,6 +367,7 @@
             <if test="promoterAddress != null">#{promoterAddress},</if>
             <if test="consignee != null">#{consignee},</if>
             <if test="courierNumber != null">#{courierNumber},</if>
+            <if test="companyCode != null">#{companyCode},</if>
             <if test="courierNumberTime != null">#{courierNumberTime},</if>
             <if test="taskFileUrl != null">#{taskFileUrl},</if>
             <if test="collectSampleStatus != null">#{collectSampleStatus},</if>
@@ -396,6 +401,7 @@
         promoter_address,
         consignee,
         courier_number,
+        company_code,
         courier_number_time,
         task_file_url,
         promoter_url,
@@ -428,6 +434,7 @@
             #{add.promoterAddress},
             #{add.consignee},
             #{add.courierNumber},
+            #{add.companyCode},
             #{add.courierNumberTime},
             #{add.taskFileUrl},
             #{add.promoterUrl},
@@ -519,6 +526,7 @@
             <if test="promoterAddress != null">promoter_address = #{promoterAddress},</if>
             <if test="consignee != null">consignee = #{consignee},</if>
             <if test="courierNumber != null">courier_number = #{courierNumber},</if>
+            <if test="companyCode != null">company_code = #{companyCode},</if>
             <if test="courierNumberTime != null">courier_number_time = #{courierNumberTime},</if>
             <if test="taskFileUrl != null">task_file_url = #{taskFileUrl},</if>
             <if test="collectSampleStatus != null">collect_sample_status = #{collectSampleStatus},</if>