huangyujie
/
qihang-ecom-erp-open
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

新增pdd订单详情接口

This commit is contained in:
启航老齐 2025-10-09 11:28:33 +08:00
parent e33113cf9d
commit 7db2690985
9 changed files with 33 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
api/open-api/libs/open-sdk-1.10.4.jar
View File

Binary file not shown.

BIN
microservices/pdd-api/libs/open-sdk-1.10.1.jar → api/open-api/libs/open-sdk-1.10.9.3.jar
View File

Binary file not shown.

2
api/open-api/pom.xml
View File

@ -89,7 +89,7 @@
<artifactId>open-sdk</artifactId>
<version>1.0</version>
<scope>system</scope>
<systemPath>${project.basedir}/libs/open-sdk-1.10.4.jar</systemPath>
<systemPath>${project.basedir}/libs/open-sdk-1.10.9.3.jar</systemPath>
</dependency>
<dependency>

BIN
microservices/pdd-api/libs/open-sdk-1.10.9.3.jar Normal file
View File

Binary file not shown.

2
microservices/pdd-api/pom.xml
View File

@ -23,7 +23,7 @@
<artifactId>open-sdk</artifactId>
<version>1.0.2</version>
<scope>system</scope>
<systemPath>${project.basedir}/libs/open-sdk-1.10.1.jar</systemPath>
<systemPath>${project.basedir}/libs/open-sdk-1.10.9.3.jar</systemPath>
</dependency>
<dependency>
<groupId>cn.qihangerp.service</groupId>

59
microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/controller/PddOrderApiController.java
View File

@ -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****************/");
@ -220,37 +219,37 @@ public class PddOrderApiController {
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<PddOrderResponse> resultVo = PddOrderApiHelper.pullOrderDetail(appKey, appSecret, accessToken,req.getOrderId());
// if (resultVo.getCode() == ResultVoEnum.SUCCESS.getIndex()) {
// PddOrder pddOrder = new PddOrder();
// BeanUtils.copyProperties(resultVo.getData(),pddOrder);
// List<PddOrderItem> 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<PddOrderItem> 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());
}
}
}

4
serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/OOrderService.java
View File

@ -38,10 +38,6 @@ public interface OOrderService extends IService<OOrder> {
*/
PageResult<OOrder> queryWaitShipmentPageList(OrderSearchRequest bo, PageQuery pageQuery);
List<OOrder> getList(OOrder order);
PageResult<OOrder> queryPageList(OrderSearchRequest bo, PageQuery pageQuery);
OOrder queryDetailById(Long id);

7
serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/OOrderServiceImpl.java
View File

@ -270,13 +270,6 @@ public class OOrderServiceImpl extends ServiceImpl<OOrderMapper, OOrder>
return PageResult.build(pages);
}
@Override
public List<OOrder> getList(OOrder order) {
return orderMapper.selectList(new LambdaQueryWrapper<>());
}
@Override
public PageResult<OOrder> queryPageList(OrderSearchRequest bo, PageQuery pageQuery) {
if(org.springframework.util.StringUtils.hasText(bo.getStartTime())){

2
serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/service/impl/PddOrderServiceImpl.java
View File

@ -186,7 +186,7 @@ public class PddOrderServiceImpl extends ServiceImpl<PddOrderMapper, PddOrder>
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);