Skip to content

M
MultipleSourceSecurity
Commit 89db6cf2 authored by Allen Chen's avatar Allen Chen
Browse files
Options

commit

parent a79e2502
Show whitespace changes
Inline Side-by-side
Showing with 122 additions and 29 deletions
PddServer/src/main/java/org/ta/pddserver/controller/PddOpenController.java
View file @ 89db6cf2
......@@ -166,17 +166,23 @@ public class PddOpenController {
// 按照所有包裹计算重量，计算运费
List<LogOrderMailDetailEntity> mailDetailEntityList = orderMailDetailImpl.getListByCode(orderCode);
for (LogOrderMailDetailEntity mailDetailEntity : mailDetailEntityList) {
weight += PddJYPriceTool.calculateWeight(mailDetailEntity.getLength(),
log.info("mailNo:{} weight:{}", mailDetailEntity.getMailNo(), mailDetailEntity.getWeight());
long currWeight = PddJYPriceTool.calculateWeight(mailDetailEntity.getLength(),
mailDetailEntity.getWidth(),
mailDetailEntity.getHeight(),
mailDetailEntity.getWeight(),
"SENDTORECEVER".equals(queryRequest.getSegmentCode()));
log.info("mailNo:{} weight:{}, fee:{}", mailDetailEntity.getMailNo(), currWeight);
weight += currWeight;
}
freightFee = PddJYPriceTool.calculateFreightFee(weight,
queryRequest.getGoodsType(),
1,
"SENDTORECEVER".equals(queryRequest.getSegmentCode())
);
log.info("weight:{}, fee:{}", weight, freightFee);
}
}
......@@ -604,6 +610,8 @@ public class PddOpenController {
//最新详情列表
List<PddServiceConsoOrderUpdateRequest.MailDetail> listNew = updateRequest.getMailDetails();
List<PddServiceConsoOrderUpdateRequest.MailDetail> deleteList = new ArrayList<>();
List<PddServiceConsoOrderUpdateRequest.MailDetail> addList = new ArrayList<>();
//根据集运单号获取运单详情列表
List<LogOrderMailDetailEntity> list = orderMailDetailImpl.getListByCode(orderUpdateEntity.getLogisticsOrderCode());
......
PddServer/src/test/java/org/ta/pddserver/CommonTest.java
View file @ 89db6cf2
......@@ -22,6 +22,8 @@ public class CommonTest {
private static final String CLIENT_ID = "d0217707e1194c46b57e696ac7619a06";
private static final String CLIENT_SECRET = "a5aba84483d8387030899f01276b06a194942470";
private String firstLogisticsOrderCode = "PC25110414698518938137527";
private static String getNowString() {
Date date = new Date();
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
......@@ -90,15 +92,14 @@ public class CommonTest {
*/
@Test
public void receive() {
String LogisticsOrderCode = "PC25110315105366425637527";
String mailNo = "773888539989914";
String mailNo = "773838955577767";
String expressCode = "STO";
String action = "warehouse_sign";
PddServiceConsoFirstBizActionNotifyRequest notifyRequest = new PddServiceConsoFirstBizActionNotifyRequest();
notifyRequest.setProviderCode(PROVIDER_CODE);
notifyRequest.setExecuteTime(getNowString());
notifyRequest.setTimeZone("UTC+8");
notifyRequest.setLogisticsOrderCode(LogisticsOrderCode);
notifyRequest.setLogisticsOrderCode(firstLogisticsOrderCode);
notifyRequest.setBizAction(action);
PddServiceConsoFirstBizActionNotifyRequest.Result notifyResult = new PddServiceConsoFirstBizActionNotifyRequest.Result();
notifyRequest.setMailNo(mailNo);
......@@ -140,7 +141,6 @@ public class CommonTest {
*/
@Test
public void reject() {
String LogisticsOrderCode = "PC25110309183009177837527";
String mailNo = "773074032778146";
String expressCode = "STO";
String action = "warehouse_reject_sign";
......@@ -148,7 +148,7 @@ public class CommonTest {
notifyRequest.setProviderCode(PROVIDER_CODE);
notifyRequest.setExecuteTime(getNowString());
notifyRequest.setTimeZone("UTC+8");
notifyRequest.setLogisticsOrderCode(LogisticsOrderCode);
notifyRequest.setLogisticsOrderCode(firstLogisticsOrderCode);
notifyRequest.setBizAction(action);
PddServiceConsoFirstBizActionNotifyRequest.Result notifyResult = new PddServiceConsoFirstBizActionNotifyRequest.Result();
notifyRequest.setMailNo(mailNo);
......@@ -198,15 +198,14 @@ public class CommonTest {
@Test
public void inBound() {
String LogisticsOrderCode = "PC25110315105366425637527";
String mailNo = "773888539989914";
String mailNo = "773838955577767";
String expressCode = "STO";
PddServiceConsoInboundRequest notifyRequest = new PddServiceConsoInboundRequest();
// PddServiceConsoFirstBizActionNotifyRequest notifyRequest = new PddServiceConsoFirstBizActionNotifyRequest();
notifyRequest.setProviderCode(PROVIDER_CODE);
notifyRequest.setLogisticsOrderCode(LogisticsOrderCode);
notifyRequest.setLogisticsOrderCode(firstLogisticsOrderCode);
notifyRequest.setExecuteTime(getNowString());
// notifyRequest.setExecuteTime("2025-05-04 00:00:00");
notifyRequest.setTimeZone("UTC+8");
......@@ -249,7 +248,7 @@ public class CommonTest {
*/
@Test
public void beginPick() {
String LogisticsOrderCode = "PP25110323338785177837527";
String LogisticsOrderCode = "PP25110413743895347237527";
String mailNo = "773129289243424";
String expressCode = "STO";
String action = "begin_pick";
......@@ -299,7 +298,7 @@ public class CommonTest {
*/
@Test
public void finishPick() {
String LogisticsOrderCode = "PP25110323338785177837527";
String LogisticsOrderCode = "PP25110413743895347237527";
String mailNo = "773129289243424";
String expressCode = "STO";
String action = "finish_pick";
......@@ -361,9 +360,9 @@ public class CommonTest {
@Test
public void outBound() {
String mailNo = "BK-25110316466837504237527";
String mailNo = "BK-25110413743895347237527";
String expressCode = "KR_JD";
String orderCode = "PP25110316466837504237527";
String orderCode = "PP25110413743895347237527";
// String segmentCode = "RETURNSELLER";
String segmentCode = "SENDTORECEVER";
......@@ -389,17 +388,18 @@ public class CommonTest {
packageInfo0.setLength(30L);
packageInfo0.setWidth(30L);
packageInfo0.setHeight(30L);
packageInfo0.setWeight(1500L);
packageInfo0.setInboundMailDetails(new ArrayList<>());
PddServiceConsoOutboundRequest.InboundMailDetail inboundMailDetail0 = new PddServiceConsoOutboundRequest.InboundMailDetail();
packageInfo0.getInboundMailDetails().add(inboundMailDetail0);
inboundMailDetail0.setMailNo("773608936457954");
inboundMailDetail0.setExpressCode("STO");
PddServiceConsoOutboundRequest.InboundMailDetail inboundMailDetail1 = new PddServiceConsoOutboundRequest.InboundMailDetail();
packageInfo0.getInboundMailDetails().add(inboundMailDetail1);
inboundMailDetail1.setMailNo("773010635902734");
inboundMailDetail1.setExpressCode("STO");
packageInfo0.setWeight(1000L);
// packageInfo0.setInboundMailDetails(new ArrayList<>());
// PddServiceConsoOutboundRequest.InboundMailDetail inboundMailDetail0 = new PddServiceConsoOutboundRequest.InboundMailDetail();
// packageInfo0.getInboundMailDetails().add(inboundMailDetail0);
// inboundMailDetail0.setMailNo("773608936457954");
// inboundMailDetail0.setExpressCode("STO");
// PddServiceConsoOutboundRequest.InboundMailDetail inboundMailDetail1 = new PddServiceConsoOutboundRequest.InboundMailDetail();
// packageInfo0.getInboundMailDetails().add(inboundMailDetail1);
// inboundMailDetail1.setMailNo("773010635902734");
// inboundMailDetail1.setExpressCode("STO");
/*
PddServiceConsoOutboundRequest.PackageInfo packageInfo = new PddServiceConsoOutboundRequest.PackageInfo();
notifyRequest.getPackageInfos().add(packageInfo);
packageInfo.setOutboundMailNo(mailNo + "2");
......@@ -414,6 +414,7 @@ public class CommonTest {
packageInfo.getInboundMailDetails().add(inboundMailDetail2);
inboundMailDetail2.setMailNo("TT773010635902734");
inboundMailDetail2.setExpressCode("STO");
*/
notifyRequest.setSenderDetail(new PddServiceConsoOutboundRequest.SenderDetail());
notifyRequest.getSenderDetail().setName("海际集货仓");
......@@ -563,10 +564,9 @@ public class CommonTest {
* 问题件上传
*/
@Test
public void problemNofity() {
String mailNo = "TT3713660160898";
public void problemNotify() {
String mailNo = "773838955577767";
String expressCode = "STO";
String orderCode = "PC25102914698518937718059";
PddServiceConsoProblemOrderNotifyRequest notifyRequest = new PddServiceConsoProblemOrderNotifyRequest();
notifyRequest.setProviderCode(PROVIDER_CODE);
notifyRequest.setExecuteTime(getNowString());
......@@ -575,9 +575,9 @@ public class CommonTest {
PddServiceConsoProblemOrderNotifyRequest.MailInfo mailInfo = new PddServiceConsoProblemOrderNotifyRequest.MailInfo();
notifyRequest.getMailInfos().add(mailInfo);
mailInfo.setMailNo(mailNo);
mailInfo.setOrderCode(orderCode);
mailInfo.setOrderCode(firstLogisticsOrderCode);
mailInfo.setExpressCode(expressCode);
mailInfo.setReasonCode(OrderProblemType.PoSun.getValue());
mailInfo.setReasonCode(OrderProblemType.JinYun.getValue());
log.info("derelictionRequest:{}", JSON.toJSONString(notifyRequest));
JYBaseRequestModel requestModel = new JYBaseRequestModel();
......@@ -602,5 +602,90 @@ public class CommonTest {
}
/**
* 退运
*/
@Test
public void outBoundToSeller() {
String mailNo = "77383895557776";
String expressCode = "STO";
String orderCode = "PT25110416466837504337527";
String segmentCode = "RETURNSELLER";
// String segmentCode = "SENDTORECEVER";
PddServiceConsoOutboundRequest notifyRequest = new PddServiceConsoOutboundRequest();
notifyRequest.setProviderCode(PROVIDER_CODE);
notifyRequest.setOrderCode(orderCode);
notifyRequest.setSegmentCode(segmentCode);
notifyRequest.setExecuteTime(getNowString());
notifyRequest.setTimeZone("UTC+8");
notifyRequest.setIsSplitOut("N");
// notifyRequest.setIsSplitOut("Y");
notifyRequest.setPackageInfos(new ArrayList<>());
PddServiceConsoOutboundRequest.PackageInfo packageInfo0 = new PddServiceConsoOutboundRequest.PackageInfo();
notifyRequest.getPackageInfos().add(packageInfo0);
packageInfo0.setOutboundMailNo(mailNo + "1");
packageInfo0.setExpressCode(expressCode);
packageInfo0.setPackageType("2");
packageInfo0.setLength(30L);
packageInfo0.setWidth(30L);
packageInfo0.setHeight(30L);
packageInfo0.setWeight(1000L);
// packageInfo0.setInboundMailDetails(new ArrayList<>());
// PddServiceConsoOutboundRequest.InboundMailDetail inboundMailDetail0 = new PddServiceConsoOutboundRequest.InboundMailDetail();
// packageInfo0.getInboundMailDetails().add(inboundMailDetail0);
// inboundMailDetail0.setMailNo("773608936457954");
// inboundMailDetail0.setExpressCode("STO");
// PddServiceConsoOutboundRequest.InboundMailDetail inboundMailDetail1 = new PddServiceConsoOutboundRequest.InboundMailDetail();
// packageInfo0.getInboundMailDetails().add(inboundMailDetail1);
// inboundMailDetail1.setMailNo("773010635902734");
// inboundMailDetail1.setExpressCode("STO");
notifyRequest.setSenderDetail(new PddServiceConsoOutboundRequest.SenderDetail());
notifyRequest.getSenderDetail().setName("海际集货仓");
notifyRequest.getSenderDetail().setTelePhone("18660975251");
notifyRequest.getSenderDetail().setCountry("CN");
notifyRequest.getSenderDetail().setProvince("山东省");
notifyRequest.getSenderDetail().setCity("临沂市");
notifyRequest.getSenderDetail().setDistrict("兰山区");
notifyRequest.getSenderDetail().setDetailAddress("山东省临沂市兰山区横九路与纵十路交汇兰山财金智慧云仓五期二层二号仓");
notifyRequest.setReceiverDetail(new PddServiceConsoOutboundRequest.ReceiverDetail());
notifyRequest.getReceiverDetail().setName("玛蒂尔");
notifyRequest.getReceiverDetail().setTelePhone("15691757118");
notifyRequest.getReceiverDetail().setCountry("中国");
notifyRequest.getReceiverDetail().setProvince("上海市");
notifyRequest.getReceiverDetail().setCity("上海市");
notifyRequest.getReceiverDetail().setDistrict("长宁区");
notifyRequest.getReceiverDetail().setDetailAddress("娄山关路金虹桥国际中心南楼2号");
notifyRequest.setResult(new PddServiceConsoOutboundRequest.Result());
notifyRequest.getResult().setCode(0);
// notifyRequest.getResult().setDesc("");
// notifyRequest.getResult().setRemark("");
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));
log.info("requestModel:{}", JSON.toJSONString(requestModel));
// String resp = PddHttpTool.postRequest(requestModel);
String resp = PddHttpTool.sendJsonPost(requestModel);
log.info("resp = {}", resp);
}
}
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