Skip to content

M
MultipleSourceSecurity
Commit 0003a184 authored by Allen Chen's avatar Allen Chen
Browse files
Options

commit

parent 1d3f0b31
Show whitespace changes
Inline Side-by-side
Showing with 84 additions and 442 deletions
PddServer/src/main/java/org/ta/pddserver/controller/PddLocalController.java
View file @ 0003a184
...@@ -5,16 +5,12 @@ import com.alibaba.fastjson.JSONObject; ...@@ -5,16 +5,12 @@ import com.alibaba.fastjson.JSONObject;
import jakarta.annotation.Resource; import jakarta.annotation.Resource;
import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import org.ta.pddserver.entity.CollectOrderSendEntity; import org.ta.pddserver.entity.*;
import org.ta.pddserver.entity.CollectOutMailDetailEntity;
import org.ta.pddserver.entity.CollectReceiverDetailEntity;
import org.ta.pddserver.entity.LogOrderMailDetailIoEntity;
import org.ta.pddserver.model.api.request.*; import org.ta.pddserver.model.api.request.*;
import org.ta.pddserver.model.api.response.MailNoResponse; import org.ta.pddserver.model.api.response.*;
import org.ta.pddserver.model.pddjy.request.*; import org.ta.pddserver.model.pddjy.request.*;
import org.ta.pddserver.service.impl.*; import org.ta.pddserver.service.impl.*;
import org.ta.pddserver.utils.JsonResponse; import org.ta.pddserver.utils.JsonResponse;
...@@ -22,8 +18,7 @@ import org.ta.pddserver.utils.PddHttpTool; ...@@ -22,8 +18,7 @@ import org.ta.pddserver.utils.PddHttpTool;
import org.ta.pddserver.utils.PddSignTool; import org.ta.pddserver.utils.PddSignTool;
import org.ta.pddserver.utils.TimeTool; import org.ta.pddserver.utils.TimeTool;
import java.util.ArrayList; import java.util.*;
import java.util.Date;
@Slf4j @Slf4j
@RestController @RestController
...@@ -52,11 +47,14 @@ public class PddLocalController { ...@@ -52,11 +47,14 @@ public class PddLocalController {
private static final String WAREHOUSE_CODE = "HJJY001"; private static final String WAREHOUSE_CODE = "HJJY001";
private static final String CLIENT_ID = "d0217707e1194c46b57e696ac7619a06"; private static final String CLIENT_ID = "d0217707e1194c46b57e696ac7619a06";
private static final String CLIENT_SECRET = "a5aba84483d8387030899f01276b06a194942470"; private static final String CLIENT_SECRET = "a5aba84483d8387030899f01276b06a194942470";
@Autowired @Resource
private CollectReceiverDetailImpl collectReceiverDetailImpl; private CollectReceiverDetailImpl collectReceiverDetailImpl;
@Autowired @Resource
private CollectMailDetailImpl collectMailDetailImpl; private CollectMailDetailImpl collectMailDetailImpl;
@Resource
private CollectOrderImpl collectOrderImpl;
/*集运单列表*/ /*集运单列表*/
@PostMapping("/logOrderList") @PostMapping("/logOrderList")
public JSONObject logOrderList(HttpServletRequest request, @RequestBody LogOrderListRequest logOrderListRequest) { public JSONObject logOrderList(HttpServletRequest request, @RequestBody LogOrderListRequest logOrderListRequest) {
...@@ -76,17 +74,28 @@ public class PddLocalController { ...@@ -76,17 +74,28 @@ public class PddLocalController {
return JsonResponse.generateLocalCommonSuccessResponse(mailNoResponse); return JsonResponse.generateLocalCommonSuccessResponse(mailNoResponse);
} }
/*运单号获取所有出库单信息*/
@PostMapping("/mailNoSelectAll")
public Map mailNoSelectAll(HttpServletRequest request, @RequestBody MailNoRequest mailNoRequest) {
Map<String, Object> map = new HashMap<>();
CollectOutMailDetailEntity collectOutMailDetail = collectOutMailDetailImpl.getInfoByMailNo(mailNoRequest.getMailNo());
List<CollectOutMailDetailResponse> list = collectOutMailDetailImpl.getListByOrderCode(collectOutMailDetail.getOrderCode());
CollectOrderResponse collectOrderResponse = collectOrderImpl.getByOrderCode(collectOutMailDetail.getOrderCode());
map.put("list", list);
map.put("collectOutMailDetail", collectOutMailDetail);
return JsonResponse.generateLocalCommonSuccessResponse(map);
}
/*签收*/ /*签收*/
@PostMapping("/receive") @PostMapping("/receive")
public void receive(HttpServletRequest request, @RequestBody ReceiveRequest receiveRequest) { public void receive(HttpServletRequest request, @RequestBody ReceiveRequest receiveRequest) {
MailNoResponse mailNoResponse = logOrderMailDetailImpl.getInfoByMailNo(receiveRequest.getMailNo(), receiveRequest.getStatus()); MailNoResponse mailNoResponse = logOrderMailDetailImpl.getInfoByMailNo(receiveRequest.getMailNo(), receiveRequest.getStatus());
LogOrderMailDetailIoEntity ioEntity = new LogOrderMailDetailIoEntity();
ioEntity.setLogisticsOrderCode(mailNoResponse.getLogisticsOrderCode());
ioEntity.setExpressCode(mailNoResponse.getExpressCode());
ioEntity.setMailNo(mailNoResponse.getMailNo());
ioEntity.setAction(receiveRequest.getAction());
ioEntity.setStatus(10);
String action = receiveRequest.getAction(); String action = receiveRequest.getAction();
...@@ -130,9 +139,9 @@ public class PddLocalController { ...@@ -130,9 +139,9 @@ public class PddLocalController {
//更新log_order_mail_detail //更新log_order_mail_detail
Boolean result = logOrderMailDetailImpl.updateByMailNo(receiveRequest.getMailNo(), action); Boolean result = logOrderMailDetailImpl.updateByMailNo(receiveRequest.getMailNo(), action);
ioEntity.setReq(JSON.toJSONString(requestModel)); // ioEntity.setReq(JSON.toJSONString(requestModel));
ioEntity.setResp(resp); // ioEntity.setResp(resp);
logOrderMailDetailIo.save(ioEntity); // logOrderMailDetailIo.save(ioEntity);
} }
/*入库*/ /*入库*/
...@@ -140,11 +149,6 @@ public class PddLocalController { ...@@ -140,11 +149,6 @@ public class PddLocalController {
public void inBound(HttpServletRequest request, @RequestBody InBoundRequest inBoundRequest) { public void inBound(HttpServletRequest request, @RequestBody InBoundRequest inBoundRequest) {
MailNoResponse mailNoResponse = logOrderMailDetailImpl.getInfoByMailNo(inBoundRequest.getMailNo(), inBoundRequest.getStatus()); MailNoResponse mailNoResponse = logOrderMailDetailImpl.getInfoByMailNo(inBoundRequest.getMailNo(), inBoundRequest.getStatus());
LogOrderMailDetailIoEntity ioEntity = new LogOrderMailDetailIoEntity();
ioEntity.setLogisticsOrderCode(mailNoResponse.getLogisticsOrderCode());
ioEntity.setExpressCode(mailNoResponse.getExpressCode());
ioEntity.setMailNo(mailNoResponse.getMailNo());
ioEntity.setStatus(20);
PddServiceConsoInboundRequest notifyRequest = new PddServiceConsoInboundRequest(); PddServiceConsoInboundRequest notifyRequest = new PddServiceConsoInboundRequest();
...@@ -188,10 +192,16 @@ public class PddLocalController { ...@@ -188,10 +192,16 @@ public class PddLocalController {
String resp = PddHttpTool.sendJsonPost(requestModel); String resp = PddHttpTool.sendJsonPost(requestModel);
//更新入库包裹状态 //更新入库包裹状态
//
ioEntity.setReq(JSON.toJSONString(requestModel)); // ioEntity.setReq(JSON.toJSONString(requestModel));
ioEntity.setResp(resp); // ioEntity.setResp(resp);
logOrderMailDetailIo.save(ioEntity); // logOrderMailDetailIo.save(ioEntity);
//判断是否全部入库
if(unNum - 1 == 0){
//全部入库
logOrderImpl.updateStatusByOrderCode(mailNoResponse.getLogisticsOrderCode(), 0);
}
} }
/*收到拆包通知后 完成拆包*/ /*收到拆包通知后 完成拆包*/
...@@ -199,11 +209,6 @@ public class PddLocalController { ...@@ -199,11 +209,6 @@ public class PddLocalController {
public void finishUnpack(HttpServletRequest request, @RequestBody FinishUnpackRequest finishUnpackRequest) { public void finishUnpack(HttpServletRequest request, @RequestBody FinishUnpackRequest finishUnpackRequest) {
MailNoResponse mailNoResponse = logOrderMailDetailImpl.getInfoByMailNo(finishUnpackRequest.getMailNo(), finishUnpackRequest.getStatus()); MailNoResponse mailNoResponse = logOrderMailDetailImpl.getInfoByMailNo(finishUnpackRequest.getMailNo(), finishUnpackRequest.getStatus());
LogOrderMailDetailIoEntity ioEntity = new LogOrderMailDetailIoEntity();
ioEntity.setLogisticsOrderCode(mailNoResponse.getLogisticsOrderCode());
ioEntity.setExpressCode(mailNoResponse.getExpressCode());
ioEntity.setMailNo(mailNoResponse.getMailNo());
String action = finishUnpackRequest.getAction(); String action = finishUnpackRequest.getAction();
PddServiceConsoCoBizActionNotifyRequest notifyRequest = new PddServiceConsoCoBizActionNotifyRequest(); PddServiceConsoCoBizActionNotifyRequest notifyRequest = new PddServiceConsoCoBizActionNotifyRequest();
...@@ -215,17 +220,17 @@ public class PddLocalController { ...@@ -215,17 +220,17 @@ public class PddLocalController {
PddServiceConsoCoBizActionNotifyRequest.Result notifyResult = new PddServiceConsoCoBizActionNotifyRequest.Result(); PddServiceConsoCoBizActionNotifyRequest.Result notifyResult = new PddServiceConsoCoBizActionNotifyRequest.Result();
if (action == "begin_pick") { if (action == "begin_pick") {
ioEntity.setStatus(30); // ioEntity.setStatus(30);
notifyRequest.setBizActionDesc("开始拣货"); notifyRequest.setBizActionDesc("开始拣货");
notifyResult.setCode(0); notifyResult.setCode(0);
} else if (action == "finish_pick") { } else if (action == "finish_pick") {
ioEntity.setStatus(40); // ioEntity.setStatus(40);
notifyRequest.setBizActionDesc("拣货完成"); notifyRequest.setBizActionDesc("拣货完成");
notifyResult.setCode(0); notifyResult.setCode(0);
} else if (action == "finish_unpack") { } else if (action == "finish_unpack") {
ioEntity.setStatus(50); // ioEntity.setStatus(50);
notifyRequest.setBizActionDesc("拆包完成"); notifyRequest.setBizActionDesc("拆包完成");
notifyRequest.setUnpackRemark(""); notifyRequest.setUnpackRemark("");
...@@ -258,37 +263,55 @@ public class PddLocalController { ...@@ -258,37 +263,55 @@ public class PddLocalController {
//更新collect_mail_detail //更新collect_mail_detail
Boolean result = collectMailDetailImpl.updateByMailNo(finishUnpackRequest.getMailNo(), action); Boolean result = collectMailDetailImpl.updateByMailNo(finishUnpackRequest.getMailNo(), action);
ioEntity.setReq(JSON.toJSONString(requestModel)); // ioEntity.setReq(JSON.toJSONString(requestModel));
ioEntity.setResp(resp); // ioEntity.setResp(resp);
logOrderMailDetailIo.save(ioEntity); // logOrderMailDetailIo.save(ioEntity);
} }
/*拣货完成后出库*/ /*拣货完成后出库*/
@PostMapping("/outBound") @PostMapping("/outBound")
public void outBound(HttpServletRequest request, @RequestBody OutBoundRequest outBoundRequest) { public JSONObject outBound(HttpServletRequest request, @RequestBody OutBoundRequest outBoundRequest) {
PddServiceConsoOutboundRequest notifyRequest = new PddServiceConsoOutboundRequest(); PddServiceConsoOutboundRequest notifyRequest = new PddServiceConsoOutboundRequest();
List<OutBoundRequest.OutBoundList> outBoundList = outBoundRequest.getOutBound();
//获取所有可出库订单
List<CollectOutMailDetailResponse> list = collectOutMailDetailImpl.getListByOrderCode(outBoundRequest.getOrderCode());
for(CollectOutMailDetailResponse lists: list){
for(OutBoundRequest.OutBoundList outBoundLists: outBoundList ){
if(lists.getMailNo().equals(outBoundLists.getMailNo())){
list.remove(outBoundList);
outBoundRequest.getOutBound().remove(outBoundList);
}
}
}
if(list.size()>0 || outBoundList.size() > 0){
//出库信息与已存信息不匹配，无法出库
return JsonResponse.generateLocalCommonFailedResponse("-1", "出库单数异常");
}
CollectOrderResponse collectOrderResponse = collectOrderImpl.getByOrderCode(outBoundRequest.getOrderCode());
notifyRequest.setProviderCode(PROVIDER_CODE); notifyRequest.setProviderCode(PROVIDER_CODE);
notifyRequest.setOrderCode(outBoundRequest.getOrderCode()); notifyRequest.setOrderCode(outBoundRequest.getOrderCode());
notifyRequest.setSegmentCode(outBoundRequest.getSegmentCode()); notifyRequest.setSegmentCode(collectOrderResponse.getSegmentCode());
notifyRequest.setExecuteTime(timeTool.getNowString()); notifyRequest.setExecuteTime(timeTool.getNowString());
notifyRequest.setTimeZone("UTC+8"); notifyRequest.setTimeZone("UTC+8");
notifyRequest.setIsSplitOut("N"); notifyRequest.setIsSplitOut("N");
notifyRequest.setPackageInfos(new ArrayList<>()); notifyRequest.setPackageInfos(new ArrayList<>());
for(OutBoundRequest.OutBoundList outBoundList: outBoundRequest.getOutBound()){
CollectOutMailDetailEntity collectOutMailDetailEntity = collectOutMailDetailImpl.getInfoByMailNo(outBoundList.getMailNo());
PddServiceConsoOutboundRequest.PackageInfo packageInfo = new PddServiceConsoOutboundRequest.PackageInfo(); PddServiceConsoOutboundRequest.PackageInfo packageInfo = new PddServiceConsoOutboundRequest.PackageInfo();
notifyRequest.getPackageInfos().add(packageInfo); notifyRequest.getPackageInfos().add(packageInfo);
packageInfo.setOutboundMailNo(outBoundList.getMailNo()); packageInfo.setOutboundMailNo(outBoundRequest.getMailNo());
packageInfo.setExpressCode(outBoundList.getExpressCode()); packageInfo.setExpressCode(outBoundRequest.getExpressCode());
packageInfo.setPackageType(outBoundList.getPackageType()); packageInfo.setPackageType(outBoundRequest.getPackageType());
packageInfo.setLength(collectOutMailDetailEntity.getLength()); packageInfo.setLength(outBoundRequest.getLength());
packageInfo.setWidth(collectOutMailDetailEntity.getWidth()); packageInfo.setWidth(outBoundRequest.getWidth());
packageInfo.setHeight(collectOutMailDetailEntity.getHeight()); packageInfo.setHeight(outBoundRequest.getHeight());
packageInfo.setWeight(collectOutMailDetailEntity.getWeight()); packageInfo.setWeight(outBoundRequest.getWeight());
}
notifyRequest.setSenderDetail(new PddServiceConsoOutboundRequest.SenderDetail()); notifyRequest.setSenderDetail(new PddServiceConsoOutboundRequest.SenderDetail());
...@@ -329,6 +352,7 @@ public class PddLocalController { ...@@ -329,6 +352,7 @@ public class PddLocalController {
requestModel.setTimestamp(time); requestModel.setTimestamp(time);
requestModel.setSign(PddSignTool.generateSign(requestModel, CLIENT_SECRET)); requestModel.setSign(PddSignTool.generateSign(requestModel, CLIENT_SECRET));
String resp = PddHttpTool.sendJsonPost(requestModel); String resp = PddHttpTool.sendJsonPost(requestModel);
return null;
} }
......
PddServer/src/main/java/org/ta/pddserver/controller/PddLocalsController.java deleted 100644 → 0
View file @ 1d3f0b31
package org.ta.pddserver.controller;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import jakarta.annotation.Resource;
import jakarta.servlet.http.HttpServletRequest;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
import org.ta.pddserver.entity.*;
import org.ta.pddserver.model.api.request.*;
import org.ta.pddserver.model.api.response.*;
import org.ta.pddserver.model.pddjy.request.*;
import org.ta.pddserver.service.impl.*;
import org.ta.pddserver.utils.JsonResponse;
import org.ta.pddserver.utils.PddHttpTool;
import org.ta.pddserver.utils.PddSignTool;
import org.ta.pddserver.utils.TimeTool;
import java.util.*;
@Slf4j
@RestController
public class PddLocalsController {
@Resource
LogOrderImpl logOrderImpl;
@Resource
LogOrderMailDetailImpl logOrderMailDetailImpl;
@Resource
TimeTool timeTool;
@Resource
CollectOutMailDetailImpl collectOutMailDetailImpl;
@Resource
CollectOrderSendImpl collectOrderSendImpl;
@Resource
LogOrderMailDetailIoImpl logOrderMailDetailIo;
private static final String PROVIDER_CODE = "HAIJI_KR";
private static final String WAREHOUSE_CODE = "HJJY001";
private static final String CLIENT_ID = "d0217707e1194c46b57e696ac7619a06";
private static final String CLIENT_SECRET = "a5aba84483d8387030899f01276b06a194942470";
@Autowired
private CollectReceiverDetailImpl collectReceiverDetailImpl;
@Autowired
private CollectMailDetailImpl collectMailDetailImpl;
@Autowired
private CollectOrderImpl collectOrderImpl;
/*集运单列表*/
@PostMapping("/logOrderList")
public JSONObject logOrderList(HttpServletRequest request, @RequestBody LogOrderListRequest logOrderListRequest) {
return JsonResponse.generateLocalCommonSuccessResponse( logOrderImpl.getListByRequest(logOrderListRequest));
}
/*包裹列表*/
@PostMapping("/logOrderMailDetailList")
public JSONObject logOrderMailDetailList(HttpServletRequest request, @RequestBody LogOrderMailDetailListRequest logOrderMailDetailListRequest) {
return JsonResponse.generateLocalCommonSuccessResponse(logOrderMailDetailImpl.getListByCodeNo(logOrderMailDetailListRequest));
}
/*运单号查询*/
@PostMapping("/mailNoSelect")
public JSONObject mailNoSelect(HttpServletRequest request, @RequestBody MailNoRequest mailNoRequest) {
MailNoResponse mailNoResponse = logOrderMailDetailImpl.getInfoByMailNo(mailNoRequest.getMailNo(), mailNoRequest.getStatus());
return JsonResponse.generateLocalCommonSuccessResponse(mailNoResponse);
}
/*运单号获取所有出库单信息*/
@PostMapping("/mailNoSelectAll")
public Map mailNoSelectAll(HttpServletRequest request, @RequestBody MailNoRequest mailNoRequest) {
Map<String, Object> map = new HashMap<>();
CollectOutMailDetailEntity collectOutMailDetail = collectOutMailDetailImpl.getInfoByMailNo(mailNoRequest.getMailNo());
List<CollectOutMailDetailResponse> list = collectOutMailDetailImpl.getListByOrderCode(collectOutMailDetail.getOrderCode());
CollectOrderResponse collectOrderResponse = collectOrderImpl.getByOrderCode(collectOutMailDetail.getOrderCode());
map.put("list", list);
map.put("collectOutMailDetail", collectOutMailDetail);
return JsonResponse.generateLocalCommonSuccessResponse(map);
}
/*签收*/
@PostMapping("/receive")
public void receive(HttpServletRequest request, @RequestBody ReceiveRequest receiveRequest) {
MailNoResponse mailNoResponse = logOrderMailDetailImpl.getInfoByMailNo(receiveRequest.getMailNo(), receiveRequest.getStatus());
// LogOrderMailDetailImpl ioEntity = new LogOrderMailDetailImpl();
// ioEntity.setLogisticsOrderCode(mailNoResponse.getLogisticsOrderCode());
// ioEntity.setExpressCode(mailNoResponse.getExpressCode());
// ioEntity.setMailNo(mailNoResponse.getMailNo());
// ioEntity.setAction(receiveRequest.getAction());
// ioEntity.setStatus(10);
String action = receiveRequest.getAction();
PddServiceConsoFirstBizActionNotifyRequest notifyRequest = new PddServiceConsoFirstBizActionNotifyRequest();
notifyRequest.setProviderCode(PROVIDER_CODE);
notifyRequest.setExecuteTime(timeTool.getNowString());
notifyRequest.setTimeZone("UTC+8");
notifyRequest.setLogisticsOrderCode(mailNoResponse.getLogisticsOrderCode());
notifyRequest.setBizAction(action);
PddServiceConsoFirstBizActionNotifyRequest.Result notifyResult = new PddServiceConsoFirstBizActionNotifyRequest.Result();
notifyRequest.setMailNo(mailNoResponse.getMailNo());
notifyRequest.setExpressCode(mailNoResponse.getExpressCode());
if (action == "warehouse_sign") {
notifyRequest.setBizActionDesc("仓库签收");
notifyResult.setCode(0);
} else if (action == "warehouse_reject_sign") {
notifyRequest.setBizActionDesc("仓库拒签");
notifyResult.setCode(22);
notifyResult.setDesc("运输品类限制");
notifyResult.setRemark("运输品类限制");
notifyRequest.setResult(notifyResult);
} else if (action == "destroy") {
notifyRequest.setBizActionDesc("包裹销毁");
notifyResult.setCode(0);
}
notifyRequest.setResult(notifyResult);
JYBaseRequestModel requestModel = new JYBaseRequestModel();
requestModel.setRequest(JSON.toJSONString(notifyRequest));
requestModel.setRequest_id("" + new Date().getTime());
requestModel.setType("pdd.service.conso.first.biz.action.notify");
requestModel.setTarget_client_id(CLIENT_ID);
requestModel.setClient_id(CLIENT_ID);
long time = new Date().getTime() / 1000;
requestModel.setTimestamp(time);
requestModel.setSign(PddSignTool.generateSign(requestModel, CLIENT_SECRET));
String resp = PddHttpTool.sendJsonPost(requestModel);
//更新log_order_mail_detail
Boolean result = logOrderMailDetailImpl.updateByMailNo(receiveRequest.getMailNo(), action);
//
// ioEntity.setReq(JSON.toJSONString(requestModel));
// ioEntity.setResp(resp);
// logOrderIoImpl.save(ioEntity);
}
/*入库*/
@PostMapping("/inBound")
public void inBound(HttpServletRequest request, @RequestBody InBoundRequest inBoundRequest) {
MailNoResponse mailNoResponse = logOrderMailDetailImpl.getInfoByMailNo(inBoundRequest.getMailNo(), inBoundRequest.getStatus());
// LogOrderIoEntity ioEntity = new LogOrderIoEntity();
// ioEntity.setLogisticsOrderCode(mailNoResponse.getLogisticsOrderCode());
// ioEntity.setExpressCode(mailNoResponse.getExpressCode());
// ioEntity.setMailNo(mailNoResponse.getMailNo());
// ioEntity.setStatus(20);
PddServiceConsoInboundRequest notifyRequest = new PddServiceConsoInboundRequest();
Long status = 0L;
Long unStatus = 0L;
// 查询orderNO 下所有mailNo,判断是全部还是部分
Long unNum = logOrderMailDetailImpl.getSumByCodeStatus(mailNoResponse.getLogisticsOrderCode(), unStatus);
Long num = logOrderMailDetailImpl.getSumByCodeStatus(mailNoResponse.getLogisticsOrderCode(), status);
notifyRequest.setProviderCode(PROVIDER_CODE);
notifyRequest.setLogisticsOrderCode(mailNoResponse.getLogisticsOrderCode());
notifyRequest.setExecuteTime(timeTool.getNowString());
notifyRequest.setTimeZone("UTC+8");
notifyRequest.setStatus("FULL_INBOUND");
notifyRequest.setPackageQuantity(num + 1); // 已入库数量 + 1
notifyRequest.setPackageInfo(new PddServiceConsoInboundRequest.PackageInfo());
notifyRequest.getPackageInfo().setMailNo(mailNoResponse.getMailNo());
notifyRequest.getPackageInfo().setExpressCode(mailNoResponse.getExpressCode());
notifyRequest.getPackageInfo().setLength(inBoundRequest.getLength());
notifyRequest.getPackageInfo().setWidth(inBoundRequest.getWidth());
notifyRequest.getPackageInfo().setHeight(inBoundRequest.getHeight());
notifyRequest.getPackageInfo().setWeight(inBoundRequest.getWeight());
notifyRequest.getPackageInfo().setActualWeight(inBoundRequest.getActualWeight());
notifyRequest.getPackageInfo().setGoodsType("NORMAL");
notifyRequest.setResult(new PddServiceConsoInboundRequest.Result());
notifyRequest.getResult().setCode(0);
JYBaseRequestModel requestModel = new JYBaseRequestModel();
requestModel.setRequest(JSON.toJSONString(notifyRequest));
requestModel.setRequest_id("" + new Date().getTime());
requestModel.setType("pdd.service.conso.inbound");
requestModel.setTarget_client_id(CLIENT_ID);
requestModel.setClient_id(CLIENT_ID);
long time = new Date().getTime() / 1000;
requestModel.setTimestamp(time);
requestModel.setSign(PddSignTool.generateSign(requestModel, CLIENT_SECRET));
String resp = PddHttpTool.sendJsonPost(requestModel);
//更新入库包裹状态
// ioEntity.setReq(JSON.toJSONString(requestModel));
// ioEntity.setResp(resp);
// logOrderIoImpl.save(ioEntity);
//判断是否全部入库
if(unNum - 1 == 0){
//全部入库
logOrderImpl.updateStatusByOrderCode(mailNoResponse.getLogisticsOrderCode(), 0);
}
}
/*收到拆包通知后 完成拆包*/
@PostMapping("/finishUnpack")
public void finishUnpack(HttpServletRequest request, @RequestBody FinishUnpackRequest finishUnpackRequest) {
MailNoResponse mailNoResponse = logOrderMailDetailImpl.getInfoByMailNo(finishUnpackRequest.getMailNo(), finishUnpackRequest.getStatus());
// LogOrderIoEntity ioEntity = new LogOrderIoEntity();
// ioEntity.setLogisticsOrderCode(mailNoResponse.getLogisticsOrderCode());
// ioEntity.setExpressCode(mailNoResponse.getExpressCode());
// ioEntity.setMailNo(mailNoResponse.getMailNo());
String action = finishUnpackRequest.getAction();
PddServiceConsoCoBizActionNotifyRequest notifyRequest = new PddServiceConsoCoBizActionNotifyRequest();
notifyRequest.setProviderCode(PROVIDER_CODE);
notifyRequest.setOrderCode(mailNoResponse.getLogisticsOrderCode());
notifyRequest.setBizAction(action);
notifyRequest.setExecuteTime(timeTool.getNowString());
notifyRequest.setTimeZone("UTC+8");
PddServiceConsoCoBizActionNotifyRequest.Result notifyResult = new PddServiceConsoCoBizActionNotifyRequest.Result();
if (action == "begin_pick") {
notifyRequest.setBizActionDesc("开始拣货");
notifyResult.setCode(0);
} else if (action == "finish_pick") {
notifyRequest.setBizActionDesc("拣货完成");
notifyResult.setCode(0);
} else if (action == "finish_unpack") {
notifyRequest.setBizActionDesc("拆包完成");
notifyRequest.setUnpackRemark("");
notifyResult.setCode(0);
notifyRequest.setPackageInfos(new ArrayList<>());
PddServiceConsoCoBizActionNotifyRequest.PackageInfo packageInfo = new PddServiceConsoCoBizActionNotifyRequest.PackageInfo();
notifyRequest.getPackageInfos().add(packageInfo);
packageInfo.setWeight(finishUnpackRequest.getWeight());
packageInfo.setWidth(finishUnpackRequest.getWidth());
packageInfo.setHeight(finishUnpackRequest.getHeight());
packageInfo.setLength(finishUnpackRequest.getLength());
packageInfo.setActualWeight(finishUnpackRequest.getActualWeight());
packageInfo.setConsoType("SEA");
packageInfo.setGoodsType("NORMAL");
}
notifyRequest.setResult(notifyResult);
JYBaseRequestModel requestModel = new JYBaseRequestModel();
requestModel.setRequest(JSON.toJSONString(notifyRequest));
requestModel.setRequest_id("" + new Date().getTime());
requestModel.setType("pdd.service.conso.co.biz.action.notify");
requestModel.setTarget_client_id(CLIENT_ID);
requestModel.setClient_id(CLIENT_ID);
long time = new Date().getTime() / 1000;
requestModel.setTimestamp(time);
requestModel.setSign(PddSignTool.generateSign(requestModel, CLIENT_SECRET));
String resp = PddHttpTool.sendJsonPost(requestModel);
//更新collect_mail_detail
Boolean result = collectMailDetailImpl.updateByMailNo(finishUnpackRequest.getMailNo(), action);
// ioEntity.setReq(JSON.toJSONString(requestModel));
// ioEntity.setResp(resp);
// logOrderIoImpl.save(ioEntity);
}
/*拣货完成后出库*/
@PostMapping("/outBound")
public JSONObject outBound(HttpServletRequest request, @RequestBody OutBoundRequest outBoundRequest) {
PddServiceConsoOutboundRequest notifyRequest = new PddServiceConsoOutboundRequest();
List<OutBoundRequest.OutBoundList> outBoundList = outBoundRequest.getOutBound();
//获取所有可出库订单
List<CollectOutMailDetailResponse> list = collectOutMailDetailImpl.getListByOrderCode(outBoundRequest.getOrderCode());
for(CollectOutMailDetailResponse lists: list){
for(OutBoundRequest.OutBoundList outBoundLists: outBoundList ){
if(lists.getMailNo().equals(outBoundLists.getMailNo())){
list.remove(outBoundList);
outBoundRequest.getOutBound().remove(outBoundList);
}
}
}
if(list.size()>0 || outBoundList.size() > 0){
//出库信息与已存信息不匹配，无法出库
return JsonResponse.generateLocalCommonFailedResponse("-1", "出库单数异常");
}
/*
LogOrderIoEntity ioEntity = new LogOrderIoEntity();
ioEntity.setLogisticsOrderCode(mailNoResponse.getLogisticsOrderCode());
ioEntity.setExpressCode(mailNoResponse.getExpressCode());
ioEntity.setMailNo(mailNoResponse.getMailNo());
ioEntity.setStatus(50);
*/
CollectOrderResponse collectOrderResponse = collectOrderImpl.getByOrderCode(outBoundRequest.getOrderCode());
notifyRequest.setProviderCode(PROVIDER_CODE);
notifyRequest.setOrderCode(outBoundRequest.getOrderCode());
notifyRequest.setSegmentCode(collectOrderResponse.getSegmentCode());
notifyRequest.setExecuteTime(timeTool.getNowString());
notifyRequest.setTimeZone("UTC+8");
notifyRequest.setIsSplitOut("N");
notifyRequest.setPackageInfos(new ArrayList<>());
PddServiceConsoOutboundRequest.PackageInfo packageInfo = new PddServiceConsoOutboundRequest.PackageInfo();
notifyRequest.getPackageInfos().add(packageInfo);
packageInfo.setOutboundMailNo(outBoundRequest.getMailNo());
packageInfo.setExpressCode(outBoundRequest.getExpressCode());
packageInfo.setPackageType(outBoundRequest.getPackageType());
packageInfo.setLength(outBoundRequest.getLength());
packageInfo.setWidth(outBoundRequest.getWidth());
packageInfo.setHeight(outBoundRequest.getHeight());
packageInfo.setWeight(outBoundRequest.getWeight());
notifyRequest.setSenderDetail(new PddServiceConsoOutboundRequest.SenderDetail());
CollectOrderSendEntity collectOrderSendEntity = collectOrderSendImpl.getInfo();
notifyRequest.getSenderDetail().setName(collectOrderSendEntity.getName());
notifyRequest.getSenderDetail().setTelePhone(collectOrderSendEntity.getTelePhone());
notifyRequest.getSenderDetail().setCountry(collectOrderSendEntity.getCountry());
notifyRequest.getSenderDetail().setProvince(collectOrderSendEntity.getProvince());
notifyRequest.getSenderDetail().setCity(collectOrderSendEntity.getCity());
notifyRequest.getSenderDetail().setDistrict(collectOrderSendEntity.getDistrict());
notifyRequest.getSenderDetail().setDetailAddress(collectOrderSendEntity.getDetailAddress());
CollectReceiverDetailEntity collectReceiverDetailEntity = collectReceiverDetailImpl.getInfoByMailNo(outBoundRequest.getOrderCode());
notifyRequest.setReceiverDetail(new PddServiceConsoOutboundRequest.ReceiverDetail());
notifyRequest.getReceiverDetail().setName(collectReceiverDetailEntity.getName());
notifyRequest.getReceiverDetail().setTelePhone(collectReceiverDetailEntity.getTelePhone());
notifyRequest.getReceiverDetail().setCountry(collectReceiverDetailEntity.getCountry());
notifyRequest.getReceiverDetail().setProvince(collectReceiverDetailEntity.getProvince());
notifyRequest.getReceiverDetail().setCity(collectReceiverDetailEntity.getCity());
notifyRequest.getReceiverDetail().setDistrict(collectReceiverDetailEntity.getDistrict());
notifyRequest.getReceiverDetail().setDetailAddress(collectReceiverDetailEntity.getDetailAddress());
notifyRequest.setResult(new PddServiceConsoOutboundRequest.Result());
notifyRequest.getResult().setCode(0);
log.info("derelictionRequest:{}", JSON.toJSONString(notifyRequest));
JYBaseRequestModel requestModel = new JYBaseRequestModel();
requestModel.setRequest(JSON.toJSONString(notifyRequest));
requestModel.setRequest_id("" + new Date().getTime());
requestModel.setType("pdd.service.conso.outbound");
requestModel.setTarget_client_id(CLIENT_ID);
requestModel.setClient_id(CLIENT_ID);
long time = new Date().getTime() / 1000;
requestModel.setTimestamp(time);
requestModel.setSign(PddSignTool.generateSign(requestModel, CLIENT_SECRET));
String resp = PddHttpTool.sendJsonPost(requestModel);
return JsonResponse.generateOpenCommonSuccessResponse();
}
// /*流水查询*/
// @PostMapping("/logOrderIoSelect")
// public JSONObject logOrderIoSelect(HttpServletRequest request, @RequestBody LogOrderIoRequest param) {
// return JsonResponse.generateLocalCommonSuccessResponse(logOrderIoImpl.getListByRequest(param));
// }
}
PddServer/src/main/java/org/ta/pddserver/controller/PddOpenController.java
View file @ 0003a184
...@@ -8,6 +8,7 @@ import lombok.extern.slf4j.Slf4j; ...@@ -8,6 +8,7 @@ import lombok.extern.slf4j.Slf4j;
import org.springframework.util.StringUtils; import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.ta.pddserver.entity.*; import org.ta.pddserver.entity.*;
import org.ta.pddserver.model.api.response.CollectOrderResponse;
import org.ta.pddserver.model.enums.IdentityErrorType; import org.ta.pddserver.model.enums.IdentityErrorType;
import org.ta.pddserver.model.pddjy.request.JYBaseRequestModel; import org.ta.pddserver.model.pddjy.request.JYBaseRequestModel;
import org.ta.pddserver.model.pddjy.request.*; import org.ta.pddserver.model.pddjy.request.*;
...@@ -617,7 +618,7 @@ public class PddOpenController { ...@@ -617,7 +618,7 @@ public class PddOpenController {
reverseNotifyImpl.save(reverseNotifyEntity); reverseNotifyImpl.save(reverseNotifyEntity);
String orderCode = notifyRequest.getOrderCode(); String orderCode = notifyRequest.getOrderCode();
if (notifyRequest.getType().toUpperCase().equals("HEBAO")) { if (notifyRequest.getType().toUpperCase().equals("HEBAO")) {
CollectOrderEntity collectOrderEntity = collectOrderImpl.getByOrderCode(orderCode); CollectOrderResponse collectOrderEntity = collectOrderImpl.getByOrderCode(orderCode);
if (collectOrderEntity != null) { if (collectOrderEntity != null) {
if (notifyRequest.getStatus().toUpperCase().equals("CANCELOUTBOUND")) { if (notifyRequest.getStatus().toUpperCase().equals("CANCELOUTBOUND")) {
collectOrderImpl.updateOrderStatus(11, collectOrderEntity.getUid()); collectOrderImpl.updateOrderStatus(11, collectOrderEntity.getUid());
...@@ -699,7 +700,7 @@ public class PddOpenController { ...@@ -699,7 +700,7 @@ public class PddOpenController {
} }
public void UnpackNotice(PddServiceConsoUnpackNoticeRequest noticeRequest) { public void UnpackNotice(PddServiceConsoUnpackNoticeRequest noticeRequest) {
CollectOrderEntity collectOrderEntity = collectOrderImpl.getByOrderCode(noticeRequest.getOrderCode()); CollectOrderResponse collectOrderEntity = collectOrderImpl.getByOrderCode(noticeRequest.getOrderCode());
if (collectOrderEntity == null) { if (collectOrderEntity == null) {
log.error("未找到合包单，单号：{}", noticeRequest.getOrderCode()); log.error("未找到合包单，单号：{}", noticeRequest.getOrderCode());
} else { } else {
......
PddServer/src/main/java/org/ta/pddserver/mapper/CollectOrderMapper.java
View file @ 0003a184
...@@ -10,7 +10,7 @@ import org.ta.pddserver.model.api.response.CollectOrderResponse; ...@@ -10,7 +10,7 @@ import org.ta.pddserver.model.api.response.CollectOrderResponse;
@Mapper @Mapper
public interface CollectOrderMapper extends BaseMapper<CollectOrderEntity> { public interface CollectOrderMapper extends BaseMapper<CollectOrderEntity> {
@Select("SELECT `orderCode`, `itemQuantityTotal`, `segmentCode` FROM `collect_order` WHERE `orderCode` = #{orderCode};") @Select("SELECT `uid`,`orderCode`, `itemQuantityTotal`, `segmentCode` FROM `collect_order` WHERE `orderCode` = #{orderCode};")
CollectOrderResponse findByOrderCode(String orderCode); CollectOrderResponse findByOrderCode(String orderCode);
@Update("UPDATE `collect_order` SET `status` = #{status} WHERE `uid` = #{uid};") @Update("UPDATE `collect_order` SET `status` = #{status} WHERE `uid` = #{uid};")
......
PddServer/src/main/java/org/ta/pddserver/model/api/response/CollectOrderResponse.java
View file @ 0003a184
...@@ -5,6 +5,8 @@ import lombok.Data; ...@@ -5,6 +5,8 @@ import lombok.Data;
@Data @Data
public class CollectOrderResponse { public class CollectOrderResponse {
private String uid;
private String orderCode; private String orderCode;
private int itemQuantityTotal; private int itemQuantityTotal;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment