diff --git a/api/open-api/libs/open-sdk-1.10.4.jar b/api/open-api/libs/open-sdk-1.10.4.jar
deleted file mode 100644
index 336e1078..00000000
Binary files a/api/open-api/libs/open-sdk-1.10.4.jar and /dev/null differ
diff --git a/microservices/pdd-api/libs/open-sdk-1.10.1.jar b/api/open-api/libs/open-sdk-1.10.9.3.jar
similarity index 83%
rename from microservices/pdd-api/libs/open-sdk-1.10.1.jar
rename to api/open-api/libs/open-sdk-1.10.9.3.jar
index 8ef4821b..2aab21ca 100644
Binary files a/microservices/pdd-api/libs/open-sdk-1.10.1.jar and b/api/open-api/libs/open-sdk-1.10.9.3.jar differ
diff --git a/api/open-api/pom.xml b/api/open-api/pom.xml
index 344a2f1b..35811aa1 100644
--- a/api/open-api/pom.xml
+++ b/api/open-api/pom.xml
@@ -89,7 +89,7 @@
open-sdk
1.0
system
- ${project.basedir}/libs/open-sdk-1.10.4.jar
+ ${project.basedir}/libs/open-sdk-1.10.9.3.jar
diff --git a/microservices/pdd-api/libs/open-sdk-1.10.9.3.jar b/microservices/pdd-api/libs/open-sdk-1.10.9.3.jar
new file mode 100644
index 00000000..2aab21ca
Binary files /dev/null and b/microservices/pdd-api/libs/open-sdk-1.10.9.3.jar differ
diff --git a/microservices/pdd-api/pom.xml b/microservices/pdd-api/pom.xml
index 05d7c980..3ed3c84c 100644
--- a/microservices/pdd-api/pom.xml
+++ b/microservices/pdd-api/pom.xml
@@ -23,7 +23,7 @@
open-sdk
1.0.2
system
- ${project.basedir}/libs/open-sdk-1.10.1.jar
+ ${project.basedir}/libs/open-sdk-1.10.9.3.jar
cn.qihangerp.service
diff --git a/microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/controller/PddOrderApiController.java b/microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/controller/PddOrderApiController.java
index fdad9ce3..702bf0bc 100644
--- a/microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/controller/PddOrderApiController.java
+++ b/microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/controller/PddOrderApiController.java
@@ -196,7 +196,6 @@ public class PddOrderApiController {
return AjaxResult.success(msg);
}
-
/**
* 更新单个订单
*
@@ -204,7 +203,7 @@ public class PddOrderApiController {
* @return
* @throws
*/
- @PostMapping("/pull_order_detail")
+ @RequestMapping("/pull_order_detail")
@ResponseBody
public AjaxResult getOrderPullDetail(@RequestBody PddPullRequest req) throws Exception {
log.info("/**************主动更新pdd订单by number****************/");
@@ -217,40 +216,40 @@ public class PddOrderApiController {
var checkResult = pddApiCommon.checkBefore(req.getShopId());
if (checkResult.getCode() != HttpStatus.SUCCESS) {
- return AjaxResult.error(checkResult.getCode(), checkResult.getMsg(),checkResult.getData());
+ return AjaxResult.error(checkResult.getCode(), checkResult.getMsg(), checkResult.getData());
}
String accessToken = checkResult.getData().getAccessToken();
+ String url = checkResult.getData().getServerUrl();
String appKey = checkResult.getData().getAppKey();
String appSecret = checkResult.getData().getAppSecret();
-// ApiResultVo resultVo = PddOrderApiHelper.pullOrderDetail(appKey, appSecret, accessToken,req.getOrderId());
-// if (resultVo.getCode() == ResultVoEnum.SUCCESS.getIndex()) {
-// PddOrder pddOrder = new PddOrder();
-// BeanUtils.copyProperties(resultVo.getData(),pddOrder);
-// List orderItemList = new ArrayList<>();
-// if(resultVo.getData().getItems()!=null&&resultVo.getData().getItems().size()>0){
-// for(var item:resultVo.getData().getItems()){
-// PddOrderItem pddOrderItem = new PddOrderItem();
-// BeanUtils.copyProperties(item,pddOrderItem);
-// orderItemList.add(pddOrderItem);
-// }
-// }
-// pddOrder.setItems(orderItemList);
-// var result = orderService.saveOrder(req.getShopId(), pddOrder);
-// if (result.getCode() == ResultVoEnum.DataExist.getIndex()) {
-// //已经存在
-// log.info("/**************主动更新PDD订单:开始更新数据库:" + resultVo.getData().getOrderSn() + "存在、更新****************/");
-// mqUtils.sendApiMessage(MqMessage.build(EnumShopType.PDD, MqType.ORDER_MESSAGE,resultVo.getData().getOrderSn()));
-// } else if (result.getCode() == ResultVoEnum.SUCCESS.getIndex()) {
-// log.info("/**************主动更新PDD订单:开始更新数据库:" + resultVo.getData().getOrderSn() + "不存在、新增****************/");
-// mqUtils.sendApiMessage(MqMessage.build(EnumShopType.PDD,MqType.ORDER_MESSAGE,resultVo.getData().getOrderSn()));
-// }
-//
-// return AjaxResult.success();
-// } else {
-// return AjaxResult.error(resultVo.getCode(), resultVo.getMsg());
-// }
- return AjaxResult.error("未知错误");
+ var resultVo = PddOrderApiHelper.pullOrderDetail(appKey, appSecret, accessToken,req.getOrderId());
+ if (resultVo.getCode() == ResultVoEnum.SUCCESS.getIndex()) {
+ PddOrder pddOrder = new PddOrder();
+ BeanUtils.copyProperties(resultVo.getData(),pddOrder);
+ List orderItemList = new ArrayList<>();
+ if(resultVo.getData().getItemList()!=null&&resultVo.getData().getItemList().size()>0){
+ for(var item:resultVo.getData().getItemList()){
+ PddOrderItem pddOrderItem = new PddOrderItem();
+ BeanUtils.copyProperties(item,pddOrderItem);
+ orderItemList.add(pddOrderItem);
+ }
+ }
+ pddOrder.setItems(orderItemList);
+ var result = orderService.saveOrder(req.getShopId(), pddOrder);
+ if (result.getCode() == ResultVoEnum.DataExist.getIndex()) {
+ //已经存在
+ log.info("/**************主动更新PDD订单:开始更新数据库:" + resultVo.getData().getOrderSn() + "存在、更新****************/");
+ mqUtils.sendApiMessage(MqMessage.build(EnumShopType.PDD, MqType.ORDER_MESSAGE,resultVo.getData().getOrderSn()));
+ } else if (result.getCode() == ResultVoEnum.SUCCESS.getIndex()) {
+ log.info("/**************主动更新PDD订单:开始更新数据库:" + resultVo.getData().getOrderSn() + "不存在、新增****************/");
+ mqUtils.sendApiMessage(MqMessage.build(EnumShopType.PDD,MqType.ORDER_MESSAGE,resultVo.getData().getOrderSn()));
+ }
+
+ return AjaxResult.success();
+ } else {
+ return AjaxResult.error(resultVo.getCode(), resultVo.getMsg());
+ }
}
}
diff --git a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/OOrderService.java b/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/OOrderService.java
index c7c641af..65dd5320 100644
--- a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/OOrderService.java
+++ b/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/OOrderService.java
@@ -38,10 +38,6 @@ public interface OOrderService extends IService {
*/
PageResult queryWaitShipmentPageList(OrderSearchRequest bo, PageQuery pageQuery);
-
-
-
- List getList(OOrder order);
PageResult queryPageList(OrderSearchRequest bo, PageQuery pageQuery);
OOrder queryDetailById(Long id);
diff --git a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/OOrderServiceImpl.java b/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/OOrderServiceImpl.java
index c58b72d5..e0f06a04 100644
--- a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/OOrderServiceImpl.java
+++ b/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/OOrderServiceImpl.java
@@ -270,13 +270,6 @@ public class OOrderServiceImpl extends ServiceImpl
return PageResult.build(pages);
}
-
-
- @Override
- public List getList(OOrder order) {
- return orderMapper.selectList(new LambdaQueryWrapper<>());
- }
-
@Override
public PageResult queryPageList(OrderSearchRequest bo, PageQuery pageQuery) {
if(org.springframework.util.StringUtils.hasText(bo.getStartTime())){
diff --git a/serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/service/impl/PddOrderServiceImpl.java b/serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/service/impl/PddOrderServiceImpl.java
index f5e34ddb..1d6050a2 100644
--- a/serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/service/impl/PddOrderServiceImpl.java
+++ b/serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/service/impl/PddOrderServiceImpl.java
@@ -186,7 +186,7 @@ public class PddOrderServiceImpl extends ServiceImpl
update.setOrderChangeAmount(order.getOrderChangeAmount());
update.setRiskControlStatus(order.getRiskControlStatus());
update.setUrgeShippingTime(order.getUrgeShippingTime());
- update.setAuditStatus(0);
+// update.setAuditStatus(0);
update.setUpdateTime(new Date());
mapper.updateById(update);