|
@@ -82,8 +82,7 @@ public class KuaishouItemCollectSamplesController extends BaseController {
|
|
|
*/
|
|
|
@GetMapping("/list")
|
|
|
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();
|
|
|
try {
|
|
|
Map<String, Object> requestMap = new HashMap<>();
|
|
@@ -146,6 +145,12 @@ public class KuaishouItemCollectSamplesController extends BaseController {
|
|
|
if (!Check.isNull(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)) {
|
|
|
requestMap.put("fieId", fieId);
|
|
|
}
|
|
@@ -288,6 +293,9 @@ public class KuaishouItemCollectSamplesController extends BaseController {
|
|
|
}
|
|
|
String courierNumber = kuaishouItemCollectSamples.getCourierNumber();
|
|
|
if (!Check.isNull(courierNumber)) {
|
|
|
+ if (courierNumber.contains(" ") || courierNumber.contains(".") || courierNumber.contains("、") || courierNumber.contains(",") || courierNumber.contains("@") || courierNumber.contains("#")) {
|
|
|
+ throw new Exception("快递单号不能包含空格及特殊字符");
|
|
|
+ }
|
|
|
sampleLog.setCollectSampleStatus(4);
|
|
|
kuaishouItemCollectSamples.setCollectSampleStatus(4);
|
|
|
kuaishouItemCollectSamples.setCollectSampleDesc("商品已发货");
|
|
@@ -397,6 +405,10 @@ public class KuaishouItemCollectSamplesController extends BaseController {
|
|
|
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.setCourierNumber(courierNumber);
|
|
@@ -498,10 +510,12 @@ public class KuaishouItemCollectSamplesController extends BaseController {
|
|
|
String state = lastResult.getString("state");
|
|
|
String nu = lastResult.getString("nu");
|
|
|
String com = lastResult.getString("com");
|
|
|
+ String status = lastResult.getString("status");
|
|
|
+ String message = lastResult.getString("message");
|
|
|
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();
|
|
|
updateSample.setCourierNumber(nu);
|
|
|
updateSample.setCollectSampleStatus(5);
|
|
@@ -509,6 +523,11 @@ public class KuaishouItemCollectSamplesController extends BaseController {
|
|
|
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");
|
|
|
KuaishouItemCollectSampleExpress express = new KuaishouItemCollectSampleExpress();
|