Skip to content

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

commit

parent 3c6cdd00
Hide whitespace changes
Inline Side-by-side
Showing with 67 additions and 67 deletions
PddServer/src/main/java/org/ta/pddserver/controller/PddLocalController.java
View file @ b0e8ef95
......@@ -1079,60 +1079,60 @@ public class PddLocalController {
notifyRequest.getSenderDetail().setDetailAddress(collectOrderSendEntity.getDetailAddress());
CollectReceiverDetailEntity collectReceiverDetailEntity = collectReceiverDetailImpl.getInfoByOrderCode(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);
// CollectReceiverDetailEntity collectReceiverDetailEntity = collectReceiverDetailImpl.getInfoByOrderCode(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(PddAPIConfig.CLIENT_ID);
requestModel.setClient_id(PddAPIConfig.CLIENT_ID);
long time = new Date().getTime() / 1000;
requestModel.setTimestamp(time);
requestModel.setSign(PddSignTool.generateSign(requestModel, PddAPIConfig.CLIENT_SECRET));
String resp = PddHttpTool.sendJsonPost(requestModel);
JSONObject jsonObject = JSON.parseObject(resp);
JSONObject respObject = (JSONObject) jsonObject.get("response");
if (!respObject.getBoolean("success")) {
return JsonResponse.generateOpenCommonFailedResponse(-1, "拼多多订单出库失败");
}
WorldexUtil.noticePddOrderOut(notifyRequest.getOrderCode());
if (outBoundRequest.getOutPackageList() != null && outBoundRequest.getOutPackageList().size() > 0) {
for (OutBoundRequest.OutPackage outPackage : outBoundRequest.getOutPackageList()) {
LogOrderMailDetailIoEntity logOrderMailDetailIoEntity = new LogOrderMailDetailIoEntity();
logOrderMailDetailIoEntity.setMailNo(outPackage.getMailNo());
logOrderMailDetailIoEntity.setExpressCode(outPackage.getExpressCode());
logOrderMailDetailIoEntity.setLogisticsOrderCode(outBoundRequest.getOrderCode());
logOrderMailDetailIoEntity.setExpressCode(outPackage.getExpressCode());
logOrderMailDetailIoEntity.setStatus(StatusEnum.FINISHOUTBOUND.getCode());
logOrderMailDetailIoEntity.setAction("FINISHOUTBOUND");
logOrderMailDetailIoEntity.setReq(JSON.toJSONString(requestModel));
logOrderMailDetailIoEntity.setResp(resp);
if (outPackage.getOutBound() != null && outPackage.getOutBound().size() > 0) {
logOrderMailDetailIoEntity.setRemarks(JSONObject.toJSONString(outPackage.getOutBound()));
}
logOrderMailDetailIoImpl.save(logOrderMailDetailIoEntity);
//更新collect_mail_detail
for (CollectMailDetailEntity lists : list) {
Boolean result = collectMailDetailImpl.updateByMailNo(lists.getMailNo(), logOrderMailDetailIoEntity.getStatus());
}
}
}
collectOrderImpl.updateOrderStatus(StatusEnum.FINISHOUTBOUND.getCode(), collectOrderResponse.getUid());
// 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(PddAPIConfig.CLIENT_ID);
// requestModel.setClient_id(PddAPIConfig.CLIENT_ID);
// long time = new Date().getTime() / 1000;
// requestModel.setTimestamp(time);
// requestModel.setSign(PddSignTool.generateSign(requestModel, PddAPIConfig.CLIENT_SECRET));
// String resp = PddHttpTool.sendJsonPost(requestModel);
// JSONObject jsonObject = JSON.parseObject(resp);
// JSONObject respObject = (JSONObject) jsonObject.get("response");
// if (!respObject.getBoolean("success")) {
// return JsonResponse.generateOpenCommonFailedResponse(-1, "拼多多订单出库失败");
// }
// WorldexUtil.noticePddOrderOut(notifyRequest.getOrderCode());
// if (outBoundRequest.getOutPackageList() != null && outBoundRequest.getOutPackageList().size() > 0) {
// for (OutBoundRequest.OutPackage outPackage : outBoundRequest.getOutPackageList()) {
// LogOrderMailDetailIoEntity logOrderMailDetailIoEntity = new LogOrderMailDetailIoEntity();
// logOrderMailDetailIoEntity.setMailNo(outPackage.getMailNo());
// logOrderMailDetailIoEntity.setExpressCode(outPackage.getExpressCode());
// logOrderMailDetailIoEntity.setLogisticsOrderCode(outBoundRequest.getOrderCode());
// logOrderMailDetailIoEntity.setExpressCode(outPackage.getExpressCode());
// logOrderMailDetailIoEntity.setStatus(StatusEnum.FINISHOUTBOUND.getCode());
// logOrderMailDetailIoEntity.setAction("FINISHOUTBOUND");
// logOrderMailDetailIoEntity.setReq(JSON.toJSONString(requestModel));
// logOrderMailDetailIoEntity.setResp(resp);
// if (outPackage.getOutBound() != null && outPackage.getOutBound().size() > 0) {
// logOrderMailDetailIoEntity.setRemarks(JSONObject.toJSONString(outPackage.getOutBound()));
// }
// logOrderMailDetailIoImpl.save(logOrderMailDetailIoEntity);
//
// //更新collect_mail_detail
// for (CollectMailDetailEntity lists : list) {
// Boolean result = collectMailDetailImpl.updateByMailNo(lists.getMailNo(), logOrderMailDetailIoEntity.getStatus());
// }
// }
// }
// collectOrderImpl.updateOrderStatus(StatusEnum.FINISHOUTBOUND.getCode(), collectOrderResponse.getUid());
return JsonResponse.generateLocalCommonSuccessResponse(outBoundRequest.getOutPackageList(), "");
}
......@@ -1904,7 +1904,7 @@ public class PddLocalController {
return JsonResponse.generateLocalCommonFailedResponse("-1", "收件信息不存在，无法编辑邮编");
}
receiverDetailEntity.setPostCode(editPostCodeRequest.getPostCode());
if(collectReceiverDetailImpl.updateById(receiverDetailEntity)){
if(!collectReceiverDetailImpl.updateById(receiverDetailEntity)){
return JsonResponse.generateLocalCommonFailedResponse("-1", "修改失败");
}
return JsonResponse.generateLocalCommonSuccessResponse(receiverDetailEntity, "修改成功");
......
PddServer/src/main/resources/application.yaml
View file @ b0e8ef95
......@@ -10,12 +10,12 @@ spring:
# url: jdbc:mysql://192.168.2.222:3306/pdd_api?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT
# username: root
# password: root
# url: jdbc:mysql://lyhj-mysql.mysql.rds.aliyuncs.com:3306/pdd_prod?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT
# username: pdd
# password: pdd123
url: jdbc:mysql://rm-j6cv8n7zx12x0sqreuo.mysql.rds.aliyuncs.com:3306/pdd_prod?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT
url: jdbc:mysql://lyhj-mysql.mysql.rds.aliyuncs.com:3306/pdd_prod?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT
username: pdd
password: pdd123
# url: jdbc:mysql://rm-j6cv8n7zx12x0sqreuo.mysql.rds.aliyuncs.com:3306/pdd_prod?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT
# username: pdd
# password: pdd123
hikari:
minimum-idle: 5 # 最小空闲连接数
maximum-pool-size: 10 # 最大活跃连接数
......@@ -41,4 +41,4 @@ mybatis-plus:
pdd:
jyt: 0
gd: 0
lotto: 0
\ No newline at end of file
lotto: 1
\ No newline at end of file
PddServer/src/test/java/org/ta/pddserver/CommonTest.java
View file @ b0e8ef95
......@@ -451,11 +451,11 @@ public class CommonTest {
notifyRequest.setPackageInfos(new ArrayList<>());
PddServiceConsoCoBizActionNotifyRequest.PackageInfo packageInfo1 = new PddServiceConsoCoBizActionNotifyRequest.PackageInfo();
notifyRequest.getPackageInfos().add(packageInfo1);
packageInfo1.setWeight(2000L);
packageInfo1.setWidth(30L);
packageInfo1.setHeight(30L);
packageInfo1.setLength(30L);
packageInfo1.setActualWeight(2000L);
packageInfo1.setWeight(2000);
packageInfo1.setWidth(30);
packageInfo1.setHeight(30);
packageInfo1.setLength(30);
packageInfo1.setActualWeight(2000);
packageInfo1.setConsoType("SEA");
packageInfo1.setGoodsType("SPECIAL");
......@@ -933,11 +933,11 @@ public class CommonTest {
notifyRequest.setPackageInfos(new ArrayList<>());
PddServiceConsoCoBizActionNotifyRequest.PackageInfo packageInfo0 = new PddServiceConsoCoBizActionNotifyRequest.PackageInfo();
notifyRequest.getPackageInfos().add(packageInfo0);
packageInfo0.setWeight(600L);
packageInfo0.setWidth(30L);
packageInfo0.setHeight(30L);
packageInfo0.setLength(30L);
packageInfo0.setActualWeight(600L);
packageInfo0.setWeight(600);
packageInfo0.setWidth(30);
packageInfo0.setHeight(30);
packageInfo0.setLength(30);
packageInfo0.setActualWeight(600);
packageInfo0.setConsoType("SEA");
packageInfo0.setGoodsType("NORMAL");
......
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