|
@@ -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();
|