|
@@ -125,7 +125,6 @@ public class KuaishouItemCollectSamplesController extends BaseController {
|
|
|
if (Check.isNull(sysUser)) {
|
|
if (Check.isNull(sysUser)) {
|
|
|
throw new Exception("未获取到登录人信息");
|
|
throw new Exception("未获取到登录人信息");
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
JSONArray itemIds = requestJson.getJSONArray("itemIds");
|
|
JSONArray itemIds = requestJson.getJSONArray("itemIds");
|
|
|
if (Check.isNull(itemIds)) {
|
|
if (Check.isNull(itemIds)) {
|
|
|
throw new Exception("请传入需要申请的商品列表");
|
|
throw new Exception("请传入需要申请的商品列表");
|
|
@@ -170,7 +169,6 @@ public class KuaishouItemCollectSamplesController extends BaseController {
|
|
|
returnJson.put("code", -1);
|
|
returnJson.put("code", -1);
|
|
|
returnJson.put("message", e.getMessage());
|
|
returnJson.put("message", e.getMessage());
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
return returnJson;
|
|
return returnJson;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -214,7 +212,6 @@ public class KuaishouItemCollectSamplesController extends BaseController {
|
|
|
kuaishouItemCollectSamples.setCollectSampleDesc("作业已完成");
|
|
kuaishouItemCollectSamples.setCollectSampleDesc("作业已完成");
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
String courierNumber = kuaishouItemCollectSamples.getCourierNumber();
|
|
String courierNumber = kuaishouItemCollectSamples.getCourierNumber();
|
|
|
if (!Check.isNull(courierNumber)) {
|
|
if (!Check.isNull(courierNumber)) {
|
|
|
kuaishouItemCollectSamples.setCollectSampleStatus(4);
|
|
kuaishouItemCollectSamples.setCollectSampleStatus(4);
|
|
@@ -227,7 +224,6 @@ public class KuaishouItemCollectSamplesController extends BaseController {
|
|
|
kuaishouItemCollectSamples.setCollectSampleStatus(6);
|
|
kuaishouItemCollectSamples.setCollectSampleStatus(6);
|
|
|
kuaishouItemCollectSamples.setCollectSampleDesc("作业上传成功,待招商审核");
|
|
kuaishouItemCollectSamples.setCollectSampleDesc("作业上传成功,待招商审核");
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
kuaishouItemCollectSamplesService.updateKuaishouItemCollectSamples(kuaishouItemCollectSamples);
|
|
kuaishouItemCollectSamplesService.updateKuaishouItemCollectSamples(kuaishouItemCollectSamples);
|
|
|
returnJson.put("code", 0);
|
|
returnJson.put("code", 0);
|
|
|
returnJson.put("message", "修改成功");
|
|
returnJson.put("message", "修改成功");
|
|
@@ -240,8 +236,27 @@ public class KuaishouItemCollectSamplesController extends BaseController {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
+ @GetMapping("/detail")
|
|
|
|
|
+ public JSONObject detail(Long id) {
|
|
|
|
|
+ JSONObject returnJson = new JSONObject();
|
|
|
|
|
+ try {
|
|
|
|
|
+ if (Check.isNull(id)) {
|
|
|
|
|
+ throw new Exception("id不能为空");
|
|
|
|
|
+ }
|
|
|
|
|
+ returnJson = kuaishouItemCollectSamplesService.getDetail(id);
|
|
|
|
|
+ returnJson.put("code", 0);
|
|
|
|
|
+ returnJson.put("message", "查询成功");
|
|
|
|
|
+ } catch (Exception e) {
|
|
|
|
|
+ e.printStackTrace();
|
|
|
|
|
+ returnJson.put("code", -1);
|
|
|
|
|
+ returnJson.put("message", e.getMessage());
|
|
|
|
|
+ }
|
|
|
|
|
+ return returnJson;
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+
|
|
|
@PutMapping("/testSubscribe")
|
|
@PutMapping("/testSubscribe")
|
|
|
- public JSONObject testSubscribe(String phone, String courierNumber) {
|
|
|
|
|
|
|
+ public JSONObject testSubscribe(String phone, String courierNumber,String code) {
|
|
|
JSONObject returnJson = new JSONObject();
|
|
JSONObject returnJson = new JSONObject();
|
|
|
try {
|
|
try {
|
|
|
SubscribeParameters subscribeParameters = new SubscribeParameters();
|
|
SubscribeParameters subscribeParameters = new SubscribeParameters();
|
|
@@ -249,14 +264,13 @@ public class KuaishouItemCollectSamplesController extends BaseController {
|
|
|
subscribeParameters.setPhone(phone);
|
|
subscribeParameters.setPhone(phone);
|
|
|
SubscribeParam subscribeParam = new SubscribeParam();
|
|
SubscribeParam subscribeParam = new SubscribeParam();
|
|
|
subscribeParam.setParameters(subscribeParameters);
|
|
subscribeParam.setParameters(subscribeParameters);
|
|
|
- subscribeParam.setCompany(CompanyConstant.YD);
|
|
|
|
|
|
|
+ subscribeParam.setCompany(code);
|
|
|
subscribeParam.setNumber(courierNumber);
|
|
subscribeParam.setNumber(courierNumber);
|
|
|
subscribeParam.setKey("BPEQUJxB9244");
|
|
subscribeParam.setKey("BPEQUJxB9244");
|
|
|
SubscribeReq subscribeReq = new SubscribeReq();
|
|
SubscribeReq subscribeReq = new SubscribeReq();
|
|
|
subscribeReq.setSchema(ApiInfoConstant.SUBSCRIBE_SCHEMA);
|
|
subscribeReq.setSchema(ApiInfoConstant.SUBSCRIBE_SCHEMA);
|
|
|
subscribeReq.setParam(new Gson().toJson(subscribeParam));
|
|
subscribeReq.setParam(new Gson().toJson(subscribeParam));
|
|
|
IBaseClient subscribe = new Subscribe();
|
|
IBaseClient subscribe = new Subscribe();
|
|
|
-
|
|
|
|
|
JSONObject jsonObject = JSONObject.parseObject(subscribe.execute(subscribeReq).getBody());
|
|
JSONObject jsonObject = JSONObject.parseObject(subscribe.execute(subscribeReq).getBody());
|
|
|
System.err.println(jsonObject);
|
|
System.err.println(jsonObject);
|
|
|
System.out.println(subscribe.execute(subscribeReq));
|
|
System.out.println(subscribe.execute(subscribeReq));
|
|
@@ -274,7 +288,6 @@ public class KuaishouItemCollectSamplesController extends BaseController {
|
|
|
@PostMapping("/callback")
|
|
@PostMapping("/callback")
|
|
|
public SubscribeResp callback(HttpServletRequest request) {
|
|
public SubscribeResp callback(HttpServletRequest request) {
|
|
|
SubscribeResp subscribeResp = new SubscribeResp();
|
|
SubscribeResp subscribeResp = new SubscribeResp();
|
|
|
-
|
|
|
|
|
try {
|
|
try {
|
|
|
String param = request.getParameter("param");
|
|
String param = request.getParameter("param");
|
|
|
log.info("快递回调信息:{}", param);
|
|
log.info("快递回调信息:{}", param);
|
|
@@ -292,7 +305,7 @@ public class KuaishouItemCollectSamplesController extends BaseController {
|
|
|
updateSample.setCourierNumber(nu);
|
|
updateSample.setCourierNumber(nu);
|
|
|
updateSample.setCollectSampleStatus(5);
|
|
updateSample.setCollectSampleStatus(5);
|
|
|
updateSample.setCollectSampleDesc("快递已签收,待上传作业");
|
|
updateSample.setCollectSampleDesc("快递已签收,待上传作业");
|
|
|
- // kuaishouItemCollectSamplesService.updateByNum(updateSample);
|
|
|
|
|
|
|
+ kuaishouItemCollectSamplesService.updateByNum(updateSample);
|
|
|
}
|
|
}
|
|
|
JSONArray data = lastResult.getJSONArray("data");
|
|
JSONArray data = lastResult.getJSONArray("data");
|
|
|
KuaishouItemCollectSampleExpress express = new KuaishouItemCollectSampleExpress();
|
|
KuaishouItemCollectSampleExpress express = new KuaishouItemCollectSampleExpress();
|
|
@@ -307,7 +320,6 @@ public class KuaishouItemCollectSamplesController extends BaseController {
|
|
|
subscribeResp.setResult(Boolean.TRUE);
|
|
subscribeResp.setResult(Boolean.TRUE);
|
|
|
subscribeResp.setReturnCode("200");
|
|
subscribeResp.setReturnCode("200");
|
|
|
subscribeResp.setMessage("回调成功");
|
|
subscribeResp.setMessage("回调成功");
|
|
|
-
|
|
|
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
|
e.printStackTrace();
|
|
e.printStackTrace();
|
|
|
subscribeResp.setResult(Boolean.FALSE);
|
|
subscribeResp.setResult(Boolean.FALSE);
|