|
@@ -4,7 +4,6 @@ import java.util.HashMap;
|
|
import java.util.List;
|
|
import java.util.List;
|
|
import java.util.Map;
|
|
import java.util.Map;
|
|
import javax.servlet.http.HttpServletRequest;
|
|
import javax.servlet.http.HttpServletRequest;
|
|
-import javax.servlet.http.HttpServletResponse;
|
|
|
|
|
|
|
|
import com.alibaba.fastjson.JSONArray;
|
|
import com.alibaba.fastjson.JSONArray;
|
|
import com.alibaba.fastjson.JSONObject;
|
|
import com.alibaba.fastjson.JSONObject;
|
|
@@ -16,9 +15,7 @@ import com.kuaidi100.sdk.core.IBaseClient;
|
|
import com.kuaidi100.sdk.request.SubscribeParam;
|
|
import com.kuaidi100.sdk.request.SubscribeParam;
|
|
import com.kuaidi100.sdk.request.SubscribeParameters;
|
|
import com.kuaidi100.sdk.request.SubscribeParameters;
|
|
import com.kuaidi100.sdk.request.SubscribeReq;
|
|
import com.kuaidi100.sdk.request.SubscribeReq;
|
|
-import com.kuaidi100.sdk.response.SubscribePushParamResp;
|
|
|
|
import com.kuaidi100.sdk.response.SubscribeResp;
|
|
import com.kuaidi100.sdk.response.SubscribeResp;
|
|
-import com.kuaidi100.sdk.utils.SignUtils;
|
|
|
|
import com.ruixuan.common.annotation.Log;
|
|
import com.ruixuan.common.annotation.Log;
|
|
import com.ruixuan.common.core.controller.BaseController;
|
|
import com.ruixuan.common.core.controller.BaseController;
|
|
import com.ruixuan.common.core.domain.AjaxResult;
|
|
import com.ruixuan.common.core.domain.AjaxResult;
|
|
@@ -26,11 +23,14 @@ import com.ruixuan.common.core.domain.entity.SysUser;
|
|
import com.ruixuan.common.core.page.TableDataInfo;
|
|
import com.ruixuan.common.core.page.TableDataInfo;
|
|
import com.ruixuan.common.enums.BusinessType;
|
|
import com.ruixuan.common.enums.BusinessType;
|
|
import com.ruixuan.common.utils.Check;
|
|
import com.ruixuan.common.utils.Check;
|
|
|
|
+import com.ruixuan.isc.entity.KuaishouItemCollectSampleExpress;
|
|
import com.ruixuan.isc.entity.KuaishouItemCollectSamples;
|
|
import com.ruixuan.isc.entity.KuaishouItemCollectSamples;
|
|
|
|
+import com.ruixuan.isc.enums.CompanyEnum;
|
|
import com.ruixuan.isc.service.IKuaishouItemCollectSamplesService;
|
|
import com.ruixuan.isc.service.IKuaishouItemCollectSamplesService;
|
|
import com.ruixuan.system.service.ISysDeptService;
|
|
import com.ruixuan.system.service.ISysDeptService;
|
|
import com.ruixuan.system.service.ISysRoleService;
|
|
import com.ruixuan.system.service.ISysRoleService;
|
|
import com.ruixuan.system.service.ISysUserService;
|
|
import com.ruixuan.system.service.ISysUserService;
|
|
|
|
+import lombok.extern.slf4j.Slf4j;
|
|
import org.springframework.security.access.prepost.PreAuthorize;
|
|
import org.springframework.security.access.prepost.PreAuthorize;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.web.bind.annotation.GetMapping;
|
|
import org.springframework.web.bind.annotation.GetMapping;
|
|
@@ -50,6 +50,7 @@ import org.springframework.web.bind.annotation.RestController;
|
|
* @date 2023-02-08
|
|
* @date 2023-02-08
|
|
*/
|
|
*/
|
|
@RestController
|
|
@RestController
|
|
|
|
+@Slf4j
|
|
@RequestMapping("/itemCollectSamples")
|
|
@RequestMapping("/itemCollectSamples")
|
|
public class KuaishouItemCollectSamplesController extends BaseController {
|
|
public class KuaishouItemCollectSamplesController extends BaseController {
|
|
@Autowired
|
|
@Autowired
|
|
@@ -107,10 +108,6 @@ public class KuaishouItemCollectSamplesController extends BaseController {
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
-
|
|
|
|
-
|
|
|
|
-
|
|
|
|
-
|
|
|
|
/**
|
|
/**
|
|
* 领样预览
|
|
* 领样预览
|
|
*/
|
|
*/
|
|
@@ -174,6 +171,13 @@ public class KuaishouItemCollectSamplesController extends BaseController {
|
|
return returnJson;
|
|
return returnJson;
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+
|
|
|
|
+ @GetMapping("/getCompany")
|
|
|
|
+ public List<JSONObject> getCompany() {
|
|
|
|
+ return CompanyEnum.companyList();
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+
|
|
/**
|
|
/**
|
|
* 修改【请填写功能名称】
|
|
* 修改【请填写功能名称】
|
|
*/
|
|
*/
|
|
@@ -213,7 +217,7 @@ public class KuaishouItemCollectSamplesController extends BaseController {
|
|
kuaishouItemCollectSamples.setCollectSampleStatus(4);
|
|
kuaishouItemCollectSamples.setCollectSampleStatus(4);
|
|
kuaishouItemCollectSamples.setCollectSampleDesc("商品已发货");
|
|
kuaishouItemCollectSamples.setCollectSampleDesc("商品已发货");
|
|
// 调用快递接口
|
|
// 调用快递接口
|
|
- kuaishouItemCollectSamplesService.subscribe(id,courierNumber);
|
|
|
|
|
|
+ kuaishouItemCollectSamplesService.subscribe(id, courierNumber, kuaishouItemCollectSamples.getCompanyCode());
|
|
}
|
|
}
|
|
String taskFileUrl = kuaishouItemCollectSamples.getTaskFileUrl();
|
|
String taskFileUrl = kuaishouItemCollectSamples.getTaskFileUrl();
|
|
if (Check.isNull(taskFileUrl)) { // 作业上传成功
|
|
if (Check.isNull(taskFileUrl)) { // 作业上传成功
|
|
@@ -232,9 +236,8 @@ public class KuaishouItemCollectSamplesController extends BaseController {
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
-
|
|
|
|
@PutMapping("/testSubscribe")
|
|
@PutMapping("/testSubscribe")
|
|
- public JSONObject testSubscribe(String phone,String courierNumber) {
|
|
|
|
|
|
+ public JSONObject testSubscribe(String phone, String courierNumber) {
|
|
JSONObject returnJson = new JSONObject();
|
|
JSONObject returnJson = new JSONObject();
|
|
try {
|
|
try {
|
|
SubscribeParameters subscribeParameters = new SubscribeParameters();
|
|
SubscribeParameters subscribeParameters = new SubscribeParameters();
|
|
@@ -249,6 +252,9 @@ public class KuaishouItemCollectSamplesController extends BaseController {
|
|
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());
|
|
|
|
+ System.err.println(jsonObject);
|
|
System.out.println(subscribe.execute(subscribeReq));
|
|
System.out.println(subscribe.execute(subscribeReq));
|
|
returnJson.put("code", 0);
|
|
returnJson.put("code", 0);
|
|
returnJson.put("message", "调用成功");
|
|
returnJson.put("message", "调用成功");
|
|
@@ -260,26 +266,48 @@ public class KuaishouItemCollectSamplesController extends BaseController {
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
-
|
|
|
|
@PostMapping("/callback")
|
|
@PostMapping("/callback")
|
|
- public SubscribeResp callback(HttpServletRequest request){
|
|
|
|
- String param = request.getParameter("param");
|
|
|
|
- System.err.println("快递回调数据:" + param);
|
|
|
|
-
|
|
|
|
- //建议记录一下这个回调的内容,方便出问题后双方排查问题
|
|
|
|
- //log.debug("快递100订阅推送回调结果|{}|{}",param,sign);
|
|
|
|
- //订阅时传的salt,没有可以忽略
|
|
|
|
-
|
|
|
|
|
|
+ public SubscribeResp callback(HttpServletRequest request) {
|
|
SubscribeResp subscribeResp = new SubscribeResp();
|
|
SubscribeResp subscribeResp = new SubscribeResp();
|
|
- subscribeResp.setResult(Boolean.TRUE);
|
|
|
|
- subscribeResp.setReturnCode("200");
|
|
|
|
- subscribeResp.setMessage("成功");
|
|
|
|
- //加密如果相等,属于快递100推送;否则可以忽略掉当前请求
|
|
|
|
-
|
|
|
|
- //TODO 业务处理
|
|
|
|
- // SubscribePushParamResp subscribePushParamResp = new Gson().fromJson(param, SubscribePushParamResp.class);
|
|
|
|
|
|
|
|
|
|
+ try {
|
|
|
|
+ String param = request.getParameter("param");
|
|
|
|
+ log.info("快递回调信息:{}", param);
|
|
|
|
+ JSONObject paramJson = JSONObject.parseObject(param);
|
|
|
|
+ if (Check.isNull(paramJson)) {
|
|
|
|
+ throw new Exception("回调信息为空");
|
|
|
|
+ }
|
|
|
|
+ JSONObject lastResult = paramJson.getJSONObject("lastResult");
|
|
|
|
+ if (!Check.isNull(lastResult)) {
|
|
|
|
+ String state = lastResult.getString("state");
|
|
|
|
+ String nu = lastResult.getString("nu");
|
|
|
|
+ String com = lastResult.getString("com");
|
|
|
|
+ if ("3".equals(state)) {
|
|
|
|
+ KuaishouItemCollectSamples updateSample = new KuaishouItemCollectSamples();
|
|
|
|
+ updateSample.setCourierNumber(nu);
|
|
|
|
+ updateSample.setCollectSampleStatus(5);
|
|
|
|
+ updateSample.setCollectSampleDesc("快递已签收,待上传作业");
|
|
|
|
+ kuaishouItemCollectSamplesService.updateByNum(updateSample);
|
|
|
|
+ }
|
|
|
|
+ JSONArray data = lastResult.getJSONArray("data");
|
|
|
|
+ KuaishouItemCollectSampleExpress express = new KuaishouItemCollectSampleExpress();
|
|
|
|
+ express.setCourierNumber(nu);
|
|
|
|
+ express.setCom(com);
|
|
|
|
+ express.setState(state);
|
|
|
|
+ if (!Check.isNull(data)) {
|
|
|
|
+ express.setExpressData(data.toJSONString());
|
|
|
|
+ }
|
|
|
|
+ kuaishouItemCollectSamplesService.replaceExpress(express);
|
|
|
|
+ }
|
|
|
|
+ subscribeResp.setResult(Boolean.TRUE);
|
|
|
|
+ subscribeResp.setReturnCode("200");
|
|
|
|
+ subscribeResp.setMessage("回调成功");
|
|
|
|
|
|
|
|
+ } catch (Exception e) {
|
|
|
|
+ subscribeResp.setResult(Boolean.FALSE);
|
|
|
|
+ subscribeResp.setReturnCode("-1");
|
|
|
|
+ subscribeResp.setMessage(e.getMessage());
|
|
|
|
+ }
|
|
return subscribeResp;
|
|
return subscribeResp;
|
|
}
|
|
}
|
|
|
|
|