Skip to content

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

commit

parent 5570d26f
Show whitespace changes
Inline Side-by-side
Showing with 144 additions and 51 deletions
PddServer/src/main/java/org/ta/pddserver/controller/PddLocalController.java
View file @ 3c6cdd00
......@@ -756,7 +756,7 @@ public class PddLocalController {
packageInfo.setWidth(lists.getWidth());
packageInfo.setHeight(lists.getHeight());
packageInfo.setLength(lists.getLength());
packageInfo.setActualWeight((long) PddJYPriceTool.calculateWeight(lists.getLength().intValue(), lists.getWidth().intValue(), lists.getHeight().intValue(), lists.getWeight().intValue(), true));
packageInfo.setActualWeight(PddJYPriceTool.calculateWeight(lists.getLength(), lists.getWidth(), lists.getHeight(), lists.getWeight(), true));
packageInfo.setConsoType(unpackNoticeEntity.getConsoType());
packageInfo.setGoodsType(finishUnpackRequest.getGoodsType());
......@@ -766,10 +766,10 @@ public class PddLocalController {
logOrderPackageEntity.setStatus("" + StatusEnum.FINISHUNPACK.getCode());
logOrderPackageEntity.setLogisticsOrderCode(finishUnpackRequest.getOrderCode());
logOrderPackageEntity.setPackageType(finishUnpackRequest.getGoodsType());
logOrderPackageEntity.setLength(lists.getLength().intValue());
logOrderPackageEntity.setWidth(lists.getWidth().intValue());
logOrderPackageEntity.setHeight(lists.getHeight().intValue());
logOrderPackageEntity.setWeight(lists.getWeight().intValue());
logOrderPackageEntity.setLength(lists.getLength());
logOrderPackageEntity.setWidth(lists.getWidth());
logOrderPackageEntity.setHeight(lists.getHeight());
logOrderPackageEntity.setWeight(lists.getWeight());
logOrderPackageImpl.save(logOrderPackageEntity);
......@@ -839,8 +839,6 @@ public class PddLocalController {
return JsonResponse.generateLocalCommonSuccessResponse(true, "");
}
/*收到出库通知后 开始拣货 拣货完成 */
/**
* 拣货异常
*/
......@@ -865,7 +863,7 @@ public class PddLocalController {
LogOrderMailDetailIoEntity logOrderMailDetailIoEntity = new LogOrderMailDetailIoEntity();
PddServiceConsoCoBizActionNotifyRequest.Result notifyResult = new PddServiceConsoCoBizActionNotifyRequest.Result();
CollectOrderEntity collectOrderEntity = new CollectOrderEntity();
CollectOrderEntity collectOrderEntity = null;
if (action.equals("begin_pick")) {
collectOrderEntity = collectOrderImpl.getAllInfoByOrderCode(finishUnpackRequest.getOrderCode());
......@@ -911,7 +909,7 @@ public class PddLocalController {
packageInfo.setWidth(lists.getWidth());
packageInfo.setHeight(lists.getHeight());
packageInfo.setLength(lists.getLength());
packageInfo.setActualWeight((long) PddJYPriceTool.calculateWeight(lists.getLength().intValue(), lists.getWidth().intValue(), lists.getHeight().intValue(), lists.getWeight().intValue(), true));
packageInfo.setActualWeight(PddJYPriceTool.calculateWeight(lists.getLength(), lists.getWidth(), lists.getHeight(), lists.getWeight(), true));
packageInfo.setConsoType(unpackNoticeEntity.getConsoType());
packageInfo.setGoodsType(finishUnpackRequest.getGoodsType());
......@@ -921,10 +919,10 @@ public class PddLocalController {
logOrderPackageEntity.setStatus("" + logOrderMailDetailIoEntity.getStatus());
logOrderPackageEntity.setLogisticsOrderCode(finishUnpackRequest.getOrderCode());
logOrderPackageEntity.setPackageType(finishUnpackRequest.getGoodsType());
logOrderPackageEntity.setLength(lists.getLength().intValue());
logOrderPackageEntity.setWidth(lists.getWidth().intValue());
logOrderPackageEntity.setHeight(lists.getHeight().intValue());
logOrderPackageEntity.setWeight(lists.getWeight().intValue());
logOrderPackageEntity.setLength(lists.getLength());
logOrderPackageEntity.setWidth(lists.getWidth());
logOrderPackageEntity.setHeight(lists.getHeight());
logOrderPackageEntity.setWeight(lists.getWeight());
logOrderPackageImpl.save(logOrderPackageEntity);
......@@ -974,17 +972,14 @@ public class PddLocalController {
collectMailDetailImpl.updateById(lists);
}
if (collectOrderEntity != null) {
collectOrderEntity.setStatus(logOrderMailDetailIoEntity.getStatus());
collectOrderImpl.updateById(collectOrderEntity);
}
}
return JsonResponse.generateLocalCommonSuccessResponse(true, "");
}
/*拣货完成后出库*/
@Operation(
summary = "拣货完成后出库",
......@@ -1345,7 +1340,6 @@ public class PddLocalController {
}
/* 问题件反馈 */
@Operation(
summary = "问题件反馈",
......@@ -1402,7 +1396,6 @@ public class PddLocalController {
}
/*区域列表*/
@PostMapping("/areaList")
public JSONObject areaList(HttpServletRequest request, @RequestBody AreaListRequest areaListRequest) {
......@@ -1454,7 +1447,6 @@ public class PddLocalController {
return JsonResponse.generateLocalCommonSuccessResponse(true, "上架成功");
}
/*待拆包列表*/
@PostMapping("/unpackNoticeList")
public JSONObject unpackNoticeList(HttpServletRequest request, @RequestBody UnpackNoticeListRequest unpackNoticeListRequest) {
......@@ -1523,7 +1515,6 @@ public class PddLocalController {
return JsonResponse.generateLocalCommonSuccessResponse(true, "");
}
// 发往韩国的面单打印
@PostMapping("/mailLabel")
public JSONObject mailLabel(HttpServletRequest request, HttpServletResponse response, @RequestBody MailNoRequest mailNoRequest) {
......@@ -1559,7 +1550,6 @@ public class PddLocalController {
return JsonResponse.generateLocalCommonSuccessResponse(result, "");
}
// 拆包的临时面单打印
/*拆包PDF*/
@PostMapping("/unpackLabel")
......@@ -1590,7 +1580,6 @@ public class PddLocalController {
return JsonResponse.generateLocalCommonSuccessResponse(result, "");
}
// 合包的临时面单打印
/*出库PDF*/
@PostMapping("/collectLabel")
......@@ -1644,7 +1633,6 @@ public class PddLocalController {
return JsonResponse.generateLocalCommonSuccessResponse(map, "");
}
// 打包后的临时面单打印
/*出库PDF*/
@PostMapping("/packageMailLabel")
......@@ -1678,25 +1666,21 @@ public class PddLocalController {
return JsonResponse.generateLocalCommonSuccessResponse(result, "请打印");
}
@PostMapping("/packageComplete")
public JSONObject packageComplete(HttpServletRequest request, @RequestBody PackageCompleteRequest completeRequest) {
List<String> mailList = new ArrayList<>();
for (PackageCompleteRequest.OutPackage outPackage: completeRequest.getOutPackageList()){
String orderCode = completeRequest.getOrderCode();
for (PackageCompleteRequest.OutPackage outPackage : completeRequest.getOutPackageList()) {
mailList.addAll(outPackage.getOutBound());
}
// TODO 此处异常，需要处理
boolean unpack = false;
//获取所有可出库订单
List<CollectMailDetailEntity> list = collectMailDetailImpl.getListByOrderCode(completeRequest.getOrderCode());
List<CollectMailDetailEntity> list = collectMailDetailImpl.getListByOrderCode(orderCode);
if (list != null && !list.isEmpty()) {
// 拆单操作
// 存储需要删除的元素
List<CollectMailDetailEntity> toRemoveList = new ArrayList<>();
List<String> toRemoveOutBound = new ArrayList<>();
for (CollectMailDetailEntity lists : list) {
for (String mainNo : mailList) {
if (lists.getMailNo().equals(mainNo)) {
......@@ -1705,7 +1689,6 @@ public class PddLocalController {
}
}
}
list.removeAll(toRemoveList);
mailList.removeAll(toRemoveOutBound);
......@@ -1713,9 +1696,12 @@ public class PddLocalController {
//出库信息与已存信息不匹配，无法出库
return JsonResponse.generateLocalCommonFailedResponse("-1", "出库单数异常");
}
} else {
unpack = true;
}
packageDetailImpl.removeByOrderCode(completeRequest.getOrderCode());
for (PackageCompleteRequest.OutPackage outPackage: completeRequest.getOutPackageList()){
List<PackageDetailEntity> results = new ArrayList<>();
for (PackageCompleteRequest.OutPackage outPackage : completeRequest.getOutPackageList()) {
PackageDetailEntity detailEntity = new PackageDetailEntity();
detailEntity.setOrderCode(completeRequest.getOrderCode());
detailEntity.setMailNo(outPackage.getMailNo());
......@@ -1727,10 +1713,91 @@ public class PddLocalController {
detailEntity.setPackageType(outPackage.getPackageType());
detailEntity.setOrderType(outPackage.getOrderType());
packageDetailImpl.save(detailEntity);
results.add(detailEntity);
}
if (unpack) {
return JsonResponse.generateLocalCommonSuccessResponse(completeRequest.getOutPackageList(), "打包成功");
}
log.info("拆包单，同时发送拆包信息");
String action = "finish_unpack";
PddServiceConsoCoBizActionNotifyRequest notifyRequest = new PddServiceConsoCoBizActionNotifyRequest();
notifyRequest.setProviderCode(PddAPIConfig.PROVIDER_CODE);
notifyRequest.setOrderCode(orderCode);
notifyRequest.setBizAction(action);
notifyRequest.setExecuteTime(TimeTool.getNowString());
notifyRequest.setTimeZone("UTC+8");
LogOrderMailDetailIoEntity logOrderMailDetailIoEntity = new LogOrderMailDetailIoEntity();
PddServiceConsoCoBizActionNotifyRequest.Result notifyResult = new PddServiceConsoCoBizActionNotifyRequest.Result();
CollectOrderEntity collectOrderEntity = new CollectOrderEntity();
UnpackNoticeEntity unpackNoticeEntity = unpackNoticeImpl.getByCode(orderCode);
notifyRequest.setBizActionDesc("拆包完成");
notifyRequest.setUnpackRemark("");
notifyResult.setCode(0);
notifyRequest.setPackageInfos(new ArrayList<>());
for (PackageCompleteRequest.OutPackage outPackage : completeRequest.getOutPackageList()) {
PddServiceConsoCoBizActionNotifyRequest.PackageInfo packageInfo = new PddServiceConsoCoBizActionNotifyRequest.PackageInfo();
packageInfo.setWeight(outPackage.getWeight());
packageInfo.setWidth(outPackage.getWidth());
packageInfo.setHeight(outPackage.getHeight());
packageInfo.setLength(outPackage.getLength());
packageInfo.setActualWeight(PddJYPriceTool.calculateWeight(outPackage.getLength(), outPackage.getWidth(), outPackage.getHeight(), outPackage.getWeight(), true));
packageInfo.setConsoType(unpackNoticeEntity.getConsoType());
packageInfo.setGoodsType(outPackage.getOrderType());
notifyRequest.getPackageInfos().add(packageInfo);
LogOrderPackageEntity logOrderPackageEntity = new LogOrderPackageEntity();
logOrderPackageEntity.setStatus("" + logOrderMailDetailIoEntity.getStatus());
logOrderPackageEntity.setLogisticsOrderCode(orderCode);
logOrderPackageEntity.setPackageType(outPackage.getOrderType());
logOrderPackageEntity.setLength(outPackage.getLength());
logOrderPackageEntity.setWidth(outPackage.getWidth());
logOrderPackageEntity.setHeight(outPackage.getHeight());
logOrderPackageEntity.setWeight(outPackage.getWeight());
logOrderPackageImpl.save(logOrderPackageEntity);
PackageNoticeEntity packageNoticeEntity = packageNoticeImpl.getByOrderCode(orderCode);
if (packageNoticeEntity != null) {
packageNoticeEntity.setStatus("" + logOrderMailDetailIoEntity.getStatus());
packageNoticeImpl.updateById(packageNoticeEntity);
}
}
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(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, "拼多多上送信息失败：" + respObject.getString("message") + "；请联系技术人员。");
}
// logOrderMailDetailIoEntity.setMailNo(finishUnpackRequest.getMailNo());
logOrderMailDetailIoEntity.setLogisticsOrderCode(orderCode);
logOrderMailDetailIoEntity.setReq(JSON.toJSONString(requestModel));
logOrderMailDetailIoEntity.setResp(resp);
logOrderMailDetailIoImpl.save(logOrderMailDetailIoEntity);
return JsonResponse.generateLocalCommonSuccessResponse(completeRequest.getOutPackageList(), "打包成功且拆包成功");
}
@PostMapping("/packageScanUnpackOrderCode")
public JSONObject packageScanUnpackOrderCode(HttpServletRequest request, @RequestBody UnpackNoticeRequest unpackNoticeRequest) {
......@@ -1800,6 +1867,7 @@ public class PddLocalController {
TempStorageEntity tempStorageEntity = tempStorageImpl.getByMailNo(tempOnRequest.getMailNo());
if (tempStorageEntity == null) {
tempStorageEntity = new TempStorageEntity();
tempStorageEntity.setMailNo(tempOnRequest.getMailNo());
tempStorageEntity.setPlace(tempOnRequest.getPlace());
tempStorageImpl.save(tempStorageEntity);
......@@ -1828,5 +1896,18 @@ public class PddLocalController {
return JsonResponse.generateLocalCommonSuccessResponse(list, "");
}
/* 修改出库单收货人邮编 */
@PostMapping("/editReceiverPostCode")
public JSONObject editReceiverPostCode(HttpServletRequest request, @RequestBody EditPostCodeRequest editPostCodeRequest) {
CollectReceiverDetailEntity receiverDetailEntity = collectReceiverDetailImpl.getInfoByOrderCode(editPostCodeRequest.getOrderCode());
if (receiverDetailEntity == null) {
return JsonResponse.generateLocalCommonFailedResponse("-1", "收件信息不存在，无法编辑邮编");
}
receiverDetailEntity.setPostCode(editPostCodeRequest.getPostCode());
if(collectReceiverDetailImpl.updateById(receiverDetailEntity)){
return JsonResponse.generateLocalCommonFailedResponse("-1", "修改失败");
}
return JsonResponse.generateLocalCommonSuccessResponse(receiverDetailEntity, "修改成功");
}
}
PddServer/src/main/java/org/ta/pddserver/model/api/request/EditPostCodeRequest.java 0 → 100644
View file @ 3c6cdd00
package org.ta.pddserver.model.api.request;
import lombok.Data;
@Data
public class EditPostCodeRequest {
// 出库单号
String orderCode;
// 邮编
String postCode;
}
PddServer/src/main/java/org/ta/pddserver/model/api/request/FinishUnpackRequest.java
View file @ 3c6cdd00
......@@ -72,7 +72,7 @@ public class FinishUnpackRequest {
defaultValue = "",
requiredMode = Schema.RequiredMode.REQUIRED // 必填
)
private Long length;
private Integer length;
@Schema(
description = "包裹宽度，单位默认为厘米",
......@@ -80,7 +80,7 @@ public class FinishUnpackRequest {
defaultValue = "",
requiredMode = Schema.RequiredMode.REQUIRED // 必填
)
private Long width;
private Integer width;
@Schema(
description = "包裹高度，单位默认为厘米",
......@@ -88,7 +88,7 @@ public class FinishUnpackRequest {
defaultValue = "",
requiredMode = Schema.RequiredMode.REQUIRED // 必填
)
private Long height;
private Integer height;
@Schema(
description = "实重重量，单位默认为克",
......@@ -96,7 +96,7 @@ public class FinishUnpackRequest {
defaultValue = "",
requiredMode = Schema.RequiredMode.REQUIRED // 必填
)
private Long weight;
private Integer weight;
}
......
PddServer/src/main/java/org/ta/pddserver/model/pddjy/request/PddServiceConsoCoBizActionNotifyRequest.java
View file @ 3c6cdd00
......@@ -69,27 +69,27 @@ public class PddServiceConsoCoBizActionNotifyRequest extends JYBaseRequestModel
/**
* 包裹长度（必填，单位：厘米）
*/
private Long length;
private Integer length;
/**
* 包裹宽度（必填，单位：厘米）
*/
private Long width;
private Integer width;
/**
* 包裹高度（必填，单位：厘米）
*/
private Long height;
private Integer height;
/**
* 计费重量（必填，单位：克）
*/
private Long weight;
private Integer weight;
/**
* 实重重量（必填，单位：克）
*/
private Long actualWeight;
private Integer actualWeight;
/**
* 集运方式（必填）
......
PddServer/src/main/resources/application.yaml
View file @ 3c6cdd00
......@@ -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: 1
\ No newline at end of file
lotto: 0
\ No newline at end of file
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