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

pdd

This commit is contained in:
启航 2026-01-18 16:59:54 +08:00
parent 98ffc597e2
commit a9d4e890d3
81 changed files with 324 additions and 745 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
api/erp-api/pom.xml
View File

@ -100,11 +100,11 @@
<!-- <artifactId>goods-api</artifactId>-->
<!-- <version>1.0.6</version>-->
<!-- </dependency>-->
<dependency>
<groupId>cn.qihangerp.service</groupId>
<artifactId>order</artifactId>
<version>2.0.0</version>
</dependency>
<!-- <dependency>-->
<!-- <groupId>cn.qihangerp.service</groupId>-->
<!-- <artifactId>order</artifactId>-->
<!-- <version>2.0.0</version>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>cn.qihangerp.services</groupId>-->
<!-- <artifactId>order-api</artifactId>-->

2
api/erp-api/src/main/java/cn/qihangerp/erp/controller/AfterSaleProcessingController.java
View File

@ -5,7 +5,7 @@ import cn.qihangerp.common.PageQuery;
import cn.qihangerp.common.PageResult;
import cn.qihangerp.common.TableDataInfo;
import cn.qihangerp.model.entity.OAfterSale;
import cn.qihangerp.module.order.service.OAfterSaleService;
import cn.qihangerp.module.service.OAfterSaleService;
import cn.qihangerp.security.common.BaseController;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.GetMapping;

2
api/erp-api/src/main/java/cn/qihangerp/erp/controller/OfflineGoodsController.java
View File

@ -6,7 +6,7 @@ import cn.qihangerp.common.PageQuery;
import cn.qihangerp.common.ResultVo;
import cn.qihangerp.common.TableDataInfo;
import cn.qihangerp.model.entity.OfflineGoodsSku;
import cn.qihangerp.module.order.service.OfflineGoodsSkuService;
import cn.qihangerp.module.service.OfflineGoodsSkuService;
import cn.qihangerp.security.common.BaseController;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;

2
api/erp-api/src/main/java/cn/qihangerp/erp/controller/OfflineOrderController.java
View File

@ -10,7 +10,7 @@ import cn.qihangerp.common.mq.MqUtils;
import cn.qihangerp.model.request.OrderSearchRequest;
import cn.qihangerp.model.bo.OfflineOrderCreateBo;
import cn.qihangerp.model.bo.OfflineOrderPushBo;
import cn.qihangerp.module.order.service.OfflineOrderService;
import cn.qihangerp.module.service.OfflineOrderService;
import cn.qihangerp.security.common.BaseController;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;

2
api/erp-api/src/main/java/cn/qihangerp/erp/controller/OfflineRefundController.java
View File

@ -3,7 +3,7 @@ package cn.qihangerp.erp.controller;
import cn.qihangerp.common.PageQuery;
import cn.qihangerp.common.TableDataInfo;
import cn.qihangerp.model.request.RefundSearchRequest;
import cn.qihangerp.module.order.service.OfflineRefundService;
import cn.qihangerp.module.service.OfflineRefundService;
import cn.qihangerp.security.common.BaseController;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.GetMapping;

2
api/erp-api/src/main/java/cn/qihangerp/erp/controller/OfflineShipController.java
View File

@ -9,7 +9,7 @@ import cn.qihangerp.common.mq.MqUtils;
import cn.qihangerp.model.entity.OfflineOrder;
import cn.qihangerp.model.bo.OfflineOrderShipBo;
import cn.qihangerp.model.bo.OrderShipSendBo;
import cn.qihangerp.module.order.service.OfflineOrderService;
import cn.qihangerp.module.service.OfflineOrderService;
import cn.qihangerp.security.common.BaseController;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import lombok.AllArgsConstructor;

4
api/erp-api/src/main/java/cn/qihangerp/erp/controller/OrderController.java
View File

@ -5,8 +5,8 @@ import cn.qihangerp.common.*;
import cn.qihangerp.model.request.OrderSearchRequest;
import cn.qihangerp.model.bo.OrderAllocateShipRequest;
import cn.qihangerp.model.bo.OrderShipRequest;
import cn.qihangerp.module.order.service.OOrderItemService;
import cn.qihangerp.module.order.service.OOrderService;
import cn.qihangerp.module.service.OOrderItemService;
import cn.qihangerp.module.service.OOrderService;
import cn.qihangerp.security.common.BaseController;
import com.alibaba.fastjson2.JSONObject;
import lombok.AllArgsConstructor;

4
api/erp-api/src/main/java/cn/qihangerp/erp/controller/OrderItemController.java
View File

@ -7,8 +7,8 @@ import cn.qihangerp.common.AjaxResult;
import cn.qihangerp.common.PageQuery;
import cn.qihangerp.common.TableDataInfo;
import cn.qihangerp.model.bo.OrderItemListBo;
import cn.qihangerp.module.order.service.OOrderItemService;
import cn.qihangerp.module.order.service.OOrderService;
import cn.qihangerp.module.service.OOrderItemService;
import cn.qihangerp.module.service.OOrderService;
import cn.qihangerp.security.common.BaseController;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;

4
api/erp-api/src/main/java/cn/qihangerp/erp/controller/OrderShipController.java
View File

@ -8,8 +8,8 @@ import cn.qihangerp.common.ResultVo;
import cn.qihangerp.common.TableDataInfo;
import cn.qihangerp.model.bo.ShipStockUpBo;
import cn.qihangerp.model.bo.SupplierOrderShipBo;
import cn.qihangerp.module.order.service.OOrderShipListItemService;
import cn.qihangerp.module.order.service.OOrderShipListService;
import cn.qihangerp.module.service.OOrderShipListItemService;
import cn.qihangerp.module.service.OOrderShipListService;
import cn.qihangerp.security.common.BaseController;
import com.alibaba.fastjson2.JSON;
import lombok.AllArgsConstructor;

2
api/erp-api/src/main/java/cn/qihangerp/erp/controller/RefundController.java
View File

@ -8,7 +8,7 @@ import cn.qihangerp.common.ResultVo;
import cn.qihangerp.common.TableDataInfo;
import cn.qihangerp.model.bo.RefundProcessingBo;
import cn.qihangerp.model.bo.RefundSearchBo;
import cn.qihangerp.module.order.service.ORefundService;
import cn.qihangerp.module.service.ORefundService;
import cn.qihangerp.security.common.BaseController;
import lombok.AllArgsConstructor;
import org.springframework.security.access.prepost.PreAuthorize;

4
api/erp-api/src/main/java/cn/qihangerp/erp/controller/ReportController.java
View File

@ -5,8 +5,8 @@ import cn.qihangerp.common.AjaxResult;
import cn.qihangerp.module.goods.service.OGoodsInventoryService;
import cn.qihangerp.model.vo.SalesDailyVo;
import cn.qihangerp.model.vo.SalesTopSkuVo;
import cn.qihangerp.module.order.service.OOrderItemService;
import cn.qihangerp.module.order.service.OOrderService;
import cn.qihangerp.module.service.OOrderItemService;
import cn.qihangerp.module.service.OOrderService;
import cn.qihangerp.module.service.OShopService;
import cn.qihangerp.security.common.BaseController;
import lombok.AllArgsConstructor;

4
api/erp-api/src/main/java/cn/qihangerp/erp/controller/ShipmentController.java
View File

@ -7,8 +7,8 @@ import cn.qihangerp.common.ResultVoEnum;
import cn.qihangerp.common.TableDataInfo;
import cn.qihangerp.model.entity.OShipment;
import cn.qihangerp.model.bo.OrderShipBo;
import cn.qihangerp.module.order.service.OOrderService;
import cn.qihangerp.module.order.service.ErpShipmentService;
import cn.qihangerp.module.service.OOrderService;
import cn.qihangerp.module.service.ErpShipmentService;
import cn.qihangerp.security.common.BaseController;
import lombok.AllArgsConstructor;
import org.springframework.util.StringUtils;

326
api/erp-api/src/main/java/cn/qihangerp/erp/mq/ApiMessageServiceImpl.java
View File

@ -1,164 +1,164 @@
package cn.qihangerp.erp.mq;
import cn.qihangerp.common.ResultVo;
import cn.qihangerp.common.enums.EnumShopType;
import cn.qihangerp.common.mq.MqMessage;
import cn.qihangerp.common.mq.MqType;
import cn.qihangerp.common.utils.SpringUtils;
import cn.qihangerp.module.order.service.OOrderService;
import cn.qihangerp.module.order.service.ORefundService;
import cn.qihangerp.module.order.service.ErpShipmentService;
import cn.qihangerp.module.service.ApiMessageService;
import cn.qihangerp.erp.feign.OpenApiService;
import com.alibaba.fastjson2.JSONObject;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
@AllArgsConstructor
@Slf4j
@Service
public class ApiMessageServiceImpl implements ApiMessageService {
private final OpenApiService openApiService;
// private final PddApiService pddApiService;
// private final TaoApiService taoApiService;
// private final JdApiService jdApiService;
// private final DouApiService douApiService;
// private final WeiApiService weiApiService;
@Override
public ResultVo<Integer> messageHandle(MqMessage mqMessage) {
if (mqMessage.getMqType() == MqType.ORDER_MESSAGE) {
// 有新订单，插入新订单到shop_order
OOrderService orderService = SpringUtils.getBean(OOrderService.class);
if (mqMessage.getShopType().getIndex() == EnumShopType.JD.getIndex()) {
log.info("订单消息JD");
JSONObject jsonObject = openApiService.getJdOrderDetail(Long.parseLong(mqMessage.getKeyId()), 0);
if (jsonObject.getInteger("code") != 200 || jsonObject.getJSONObject("data") == null) {
log.info("=====jdpop order message===没有找到订单");
return ResultVo.error(404, "没有找到订单");
}
JSONObject orderDetail = jsonObject.getJSONObject("data");
orderService.jdOrderMessage(mqMessage.getKeyId(),orderDetail);
} else if (mqMessage.getShopType().getIndex() == EnumShopType.TAO.getIndex()) {
log.info("订单消息TAO");
JSONObject jsonObject = openApiService.getTaoOrderDetail(mqMessage.getKeyId());
if (jsonObject.getInteger("code") != 200 || jsonObject.getJSONObject("data") == null) {
log.error("===查询原始订单错误==={}",jsonObject.getString("msg"));
log.info("=====tao order message===没有找到订单");
return ResultVo.error(404, "没有找到订单");
}
JSONObject orderDetail = jsonObject.getJSONObject("data");
orderService.taoOrderMessage(mqMessage.getKeyId(), orderDetail);
} else if (mqMessage.getShopType().getIndex() == EnumShopType.PDD.getIndex()) {
log.info("订单消息PDD");
JSONObject jsonObject = openApiService.getPddOrderDetail(mqMessage.getKeyId());
if (jsonObject.getInteger("code") != 200 || jsonObject.getJSONObject("data") == null) {
log.info("=====pdd order message===没有找到订单:{}",jsonObject.getString("msg"));
return ResultVo.error(404, "没有找到订单");
}
JSONObject orderDetail = jsonObject.getJSONObject("data");
ResultVo<Long> longResultVo = orderService.pddOrderMessage(mqMessage.getKeyId(), orderDetail);
log.info("===========pdd order message result={}",JSONObject.toJSONString(longResultVo));
} else if (mqMessage.getShopType().getIndex() == EnumShopType.DOU.getIndex()) {
log.info("订单消息DOU");
JSONObject jsonObject = openApiService.getDouOrderDetail(mqMessage.getKeyId());
if (jsonObject.getInteger("code") != 200 || jsonObject.getJSONObject("data") == null) {
log.info("=====dou order message===没有找到订单");
return ResultVo.error(404, "没有找到订单");
}
JSONObject orderDetail = jsonObject.getJSONObject("data");
orderService.douOrderMessage(mqMessage.getKeyId(), orderDetail);
} else if (mqMessage.getShopType().getIndex() == EnumShopType.OFFLINE.getIndex()) {
log.info("订单消息OFFLINE");
orderService.offlineOrderMessage(mqMessage.getKeyId());
} else if (mqMessage.getShopType().getIndex() == EnumShopType.WEI.getIndex()) {
log.info("订单消息WEI");
JSONObject jsonObject = openApiService.getWeiOrderDetail(mqMessage.getKeyId());
if (jsonObject.getInteger("code") != 200 || jsonObject.getJSONObject("data") == null) {
log.info("=====wei order message===没有找到订单");
return ResultVo.error(404, "没有找到订单");
}
JSONObject orderDetail = jsonObject.getJSONObject("data");
orderService.weiOrderMessage(mqMessage.getKeyId(), orderDetail);
}
} else if (mqMessage.getMqType() == MqType.REFUND_MESSAGE) {
// 售后消息
ORefundService refundService = SpringUtils.getBean(ORefundService.class);
if (mqMessage.getShopType().getIndex() == EnumShopType.JD.getIndex()) {
log.info("退款消息JD");
// log.info("=====jd refund message===消息处理" + serviceId);
JSONObject jsonObject = openApiService.getJdRefundDetail(Long.parseLong(mqMessage.getKeyId()), 0);
if (jsonObject.getInteger("code") != 200 || jsonObject.getJSONObject("data") == null) {
log.info("=====jd refund message===没有找到退款单");
return ResultVo.error(404, "没有找到退款单");
}
JSONObject refundDetail = jsonObject.getJSONObject("data");
refundService.jdRefundMessage(mqMessage.getKeyId(), refundDetail);
} else if (mqMessage.getShopType().getIndex() == EnumShopType.TAO.getIndex()) {
log.info("退款消息TAO");
JSONObject jsonObject = openApiService.getTaoRefundDetail(Long.parseLong(mqMessage.getKeyId()));
if (jsonObject.getInteger("code") != 200 || jsonObject.getJSONObject("data") == null) {
log.info("=====tao refund message===没有找到退款单");
return ResultVo.error(404, "没有找到退款单");
}
JSONObject refundDetail = jsonObject.getJSONObject("data");
refundService.taoRefundMessage(mqMessage.getKeyId(), refundDetail);
} else if (mqMessage.getShopType().getIndex() == EnumShopType.PDD.getIndex()) {
log.info("退款消息PDD");
JSONObject jsonObject = openApiService.getPddRefundDetail(Long.parseLong(mqMessage.getKeyId()));
if (jsonObject.getInteger("code") != 200 || jsonObject.getJSONObject("data") == null) {
log.info("=====pdd refund message===没有找到退款单");
return ResultVo.error(404, "没有找到退款单");
}
JSONObject refundDetail = jsonObject.getJSONObject("data");
refundService.pddRefundMessage(mqMessage.getKeyId(), refundDetail);
} else if (mqMessage.getShopType().getIndex() == EnumShopType.DOU.getIndex()) {
log.info("退款消息DOU");
JSONObject jsonObject = openApiService.getDouRefundDetail(mqMessage.getKeyId());
if (jsonObject.getInteger("code") != 200 || jsonObject.getJSONObject("data") == null) {
log.info("=====dou refund message===没有找到退款单");
return ResultVo.error(404, "没有找到退款单");
}
JSONObject refundDetail = jsonObject.getJSONObject("data");
refundService.douRefundMessage(mqMessage.getKeyId(), refundDetail);
} else if (mqMessage.getShopType().getIndex() == EnumShopType.WEI.getIndex()) {
log.info("退款消息WEI");
JSONObject jsonObject = openApiService.getWeiRefundDetail(mqMessage.getKeyId());
if (jsonObject.getInteger("code") != 200 || jsonObject.getJSONObject("data") == null) {
log.info("=====dou refund message===没有找到退款单");
return ResultVo.error(404, "没有找到退款单");
}
JSONObject refundDetail = jsonObject.getJSONObject("data");
refundService.weiRefundMessage(mqMessage.getKeyId(), refundDetail);
}
} else if (mqMessage.getMqType() == MqType.SHIP_STOCKUP_MESSAGE) {
// 备货消息
log.info("=================收到备货消息==============");
if (mqMessage.getShopType().getIndex() == EnumShopType.OFFLINE.getIndex()) {
ErpShipmentService shipmentService = SpringUtils.getBean(ErpShipmentService.class);
// shipmentService.shipStockup(mqMessage.getKeyId(), EnumShopType.OFFLINE);
}
} else if (mqMessage.getMqType() == MqType.SHIP_SEND_MESSAGE) {
// 发货消息
log.info("=================收到发货消息==============");
if (mqMessage.getShopType().getIndex() == EnumShopType.OFFLINE.getIndex()) {
ErpShipmentService shipmentService = SpringUtils.getBean(ErpShipmentService.class);
// shipmentService.shipSendMessage(mqMessage.getKeyId(), EnumShopType.OFFLINE, mqMessage.getData1(), mqMessage.getData2());
//package cn.qihangerp.erp.mq;
//
//import cn.qihangerp.common.ResultVo;
//import cn.qihangerp.common.enums.EnumShopType;
//import cn.qihangerp.common.mq.MqMessage;
//import cn.qihangerp.common.mq.MqType;
//import cn.qihangerp.common.utils.SpringUtils;
//import cn.qihangerp.module.service.OOrderService;
//import cn.qihangerp.module.service.ORefundService;
//import cn.qihangerp.module.service.ErpShipmentService;
//import cn.qihangerp.module.service.ApiMessageService;
//import cn.qihangerp.erp.feign.OpenApiService;
//import com.alibaba.fastjson2.JSONObject;
//import lombok.AllArgsConstructor;
//import lombok.extern.slf4j.Slf4j;
//import org.springframework.stereotype.Service;
//
//@AllArgsConstructor
//@Slf4j
//@Service
//public class ApiMessageServiceImpl implements ApiMessageService {
// private final OpenApiService openApiService;
//// private final PddApiService pddApiService;
//// private final TaoApiService taoApiService;
//// private final JdApiService jdApiService;
//// private final DouApiService douApiService;
//// private final WeiApiService weiApiService;
//
// @Override
// public ResultVo<Integer> messageHandle(MqMessage mqMessage) {
// if (mqMessage.getMqType() == MqType.ORDER_MESSAGE) {
// // 有新订单，插入新订单到shop_order
// OOrderService orderService = SpringUtils.getBean(OOrderService.class);
// if (mqMessage.getShopType().getIndex() == EnumShopType.JD.getIndex()) {
// log.info("订单消息JD");
// JSONObject jsonObject = openApiService.getJdOrderDetail(Long.parseLong(mqMessage.getKeyId()), 0);
// if (jsonObject.getInteger("code") != 200 || jsonObject.getJSONObject("data") == null) {
// log.info("=====jdpop order message===没有找到订单");
// return ResultVo.error(404, "没有找到订单");
// }
// JSONObject orderDetail = jsonObject.getJSONObject("data");
// orderService.jdOrderMessage(mqMessage.getKeyId(),orderDetail);
//
// } else if (mqMessage.getShopType().getIndex() == EnumShopType.TAO.getIndex()) {
// log.info("订单消息TAO");
// JSONObject jsonObject = openApiService.getTaoOrderDetail(mqMessage.getKeyId());
// if (jsonObject.getInteger("code") != 200 || jsonObject.getJSONObject("data") == null) {
// log.error("===查询原始订单错误==={}",jsonObject.getString("msg"));
// log.info("=====tao order message===没有找到订单");
// return ResultVo.error(404, "没有找到订单");
// }
//
// JSONObject orderDetail = jsonObject.getJSONObject("data");
// orderService.taoOrderMessage(mqMessage.getKeyId(), orderDetail);
// } else if (mqMessage.getShopType().getIndex() == EnumShopType.PDD.getIndex()) {
// log.info("订单消息PDD");
// JSONObject jsonObject = openApiService.getPddOrderDetail(mqMessage.getKeyId());
// if (jsonObject.getInteger("code") != 200 || jsonObject.getJSONObject("data") == null) {
// log.info("=====pdd order message===没有找到订单:{}",jsonObject.getString("msg"));
// return ResultVo.error(404, "没有找到订单");
// }
//
// JSONObject orderDetail = jsonObject.getJSONObject("data");
// ResultVo<Long> longResultVo = orderService.pddOrderMessage(mqMessage.getKeyId(), orderDetail);
// log.info("===========pdd order message result={}",JSONObject.toJSONString(longResultVo));
// } else if (mqMessage.getShopType().getIndex() == EnumShopType.DOU.getIndex()) {
// log.info("订单消息DOU");
// JSONObject jsonObject = openApiService.getDouOrderDetail(mqMessage.getKeyId());
// if (jsonObject.getInteger("code") != 200 || jsonObject.getJSONObject("data") == null) {
// log.info("=====dou order message===没有找到订单");
// return ResultVo.error(404, "没有找到订单");
// }
//
// JSONObject orderDetail = jsonObject.getJSONObject("data");
// orderService.douOrderMessage(mqMessage.getKeyId(), orderDetail);
// } else if (mqMessage.getShopType().getIndex() == EnumShopType.OFFLINE.getIndex()) {
// log.info("订单消息OFFLINE");
// orderService.offlineOrderMessage(mqMessage.getKeyId());
}
}
return null;
}
}
// } else if (mqMessage.getShopType().getIndex() == EnumShopType.WEI.getIndex()) {
// log.info("订单消息WEI");
// JSONObject jsonObject = openApiService.getWeiOrderDetail(mqMessage.getKeyId());
// if (jsonObject.getInteger("code") != 200 || jsonObject.getJSONObject("data") == null) {
// log.info("=====wei order message===没有找到订单");
// return ResultVo.error(404, "没有找到订单");
// }
//
// JSONObject orderDetail = jsonObject.getJSONObject("data");
// orderService.weiOrderMessage(mqMessage.getKeyId(), orderDetail);
// }
//
// } else if (mqMessage.getMqType() == MqType.REFUND_MESSAGE) {
// // 售后消息
// ORefundService refundService = SpringUtils.getBean(ORefundService.class);
// if (mqMessage.getShopType().getIndex() == EnumShopType.JD.getIndex()) {
// log.info("退款消息JD");
//// log.info("=====jd refund message===消息处理" + serviceId);
// JSONObject jsonObject = openApiService.getJdRefundDetail(Long.parseLong(mqMessage.getKeyId()), 0);
// if (jsonObject.getInteger("code") != 200 || jsonObject.getJSONObject("data") == null) {
// log.info("=====jd refund message===没有找到退款单");
// return ResultVo.error(404, "没有找到退款单");
// }
//
// JSONObject refundDetail = jsonObject.getJSONObject("data");
// refundService.jdRefundMessage(mqMessage.getKeyId(), refundDetail);
// } else if (mqMessage.getShopType().getIndex() == EnumShopType.TAO.getIndex()) {
// log.info("退款消息TAO");
// JSONObject jsonObject = openApiService.getTaoRefundDetail(Long.parseLong(mqMessage.getKeyId()));
// if (jsonObject.getInteger("code") != 200 || jsonObject.getJSONObject("data") == null) {
// log.info("=====tao refund message===没有找到退款单");
// return ResultVo.error(404, "没有找到退款单");
// }
//
// JSONObject refundDetail = jsonObject.getJSONObject("data");
// refundService.taoRefundMessage(mqMessage.getKeyId(), refundDetail);
// } else if (mqMessage.getShopType().getIndex() == EnumShopType.PDD.getIndex()) {
// log.info("退款消息PDD");
// JSONObject jsonObject = openApiService.getPddRefundDetail(Long.parseLong(mqMessage.getKeyId()));
// if (jsonObject.getInteger("code") != 200 || jsonObject.getJSONObject("data") == null) {
// log.info("=====pdd refund message===没有找到退款单");
// return ResultVo.error(404, "没有找到退款单");
// }
//
// JSONObject refundDetail = jsonObject.getJSONObject("data");
// refundService.pddRefundMessage(mqMessage.getKeyId(), refundDetail);
// } else if (mqMessage.getShopType().getIndex() == EnumShopType.DOU.getIndex()) {
// log.info("退款消息DOU");
// JSONObject jsonObject = openApiService.getDouRefundDetail(mqMessage.getKeyId());
// if (jsonObject.getInteger("code") != 200 || jsonObject.getJSONObject("data") == null) {
// log.info("=====dou refund message===没有找到退款单");
// return ResultVo.error(404, "没有找到退款单");
// }
//
// JSONObject refundDetail = jsonObject.getJSONObject("data");
// refundService.douRefundMessage(mqMessage.getKeyId(), refundDetail);
// } else if (mqMessage.getShopType().getIndex() == EnumShopType.WEI.getIndex()) {
// log.info("退款消息WEI");
// JSONObject jsonObject = openApiService.getWeiRefundDetail(mqMessage.getKeyId());
// if (jsonObject.getInteger("code") != 200 || jsonObject.getJSONObject("data") == null) {
// log.info("=====dou refund message===没有找到退款单");
// return ResultVo.error(404, "没有找到退款单");
// }
//
// JSONObject refundDetail = jsonObject.getJSONObject("data");
// refundService.weiRefundMessage(mqMessage.getKeyId(), refundDetail);
// }
// } else if (mqMessage.getMqType() == MqType.SHIP_STOCKUP_MESSAGE) {
// // 备货消息
// log.info("=================收到备货消息==============");
// if (mqMessage.getShopType().getIndex() == EnumShopType.OFFLINE.getIndex()) {
// ErpShipmentService shipmentService = SpringUtils.getBean(ErpShipmentService.class);
//// shipmentService.shipStockup(mqMessage.getKeyId(), EnumShopType.OFFLINE);
// }
// } else if (mqMessage.getMqType() == MqType.SHIP_SEND_MESSAGE) {
// // 发货消息
// log.info("=================收到发货消息==============");
// if (mqMessage.getShopType().getIndex() == EnumShopType.OFFLINE.getIndex()) {
// ErpShipmentService shipmentService = SpringUtils.getBean(ErpShipmentService.class);
//// shipmentService.shipSendMessage(mqMessage.getKeyId(), EnumShopType.OFFLINE, mqMessage.getData1(), mqMessage.getData2());
//// orderService.offlineOrderMessage(mqMessage.getKeyId());
// }
// }
// return null;
// }
//}

4
docs/qihang-erp.sql
View File

@ -2995,11 +2995,9 @@ CREATE TABLE `oms_pdd_order_item` (
`outer_id` varchar(35) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '商家外部编码（sku）',
`goods_count` int NOT NULL COMMENT '商品数量',
`remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注',
`o_goods_id` bigint NULL DEFAULT NULL COMMENT '商品id(o_goods外键)',
`o_goods_sku_id` bigint NULL DEFAULT NULL COMMENT '商品skuid(o_goods_sku外键)',
PRIMARY KEY (`id`) USING BTREE,
INDEX `index_order_sn`(`order_sn` ASC) USING BTREE
) ENGINE = InnoDB AUTO_INCREMENT = 1976126504091607207 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '拼多多订单明细表' ROW_FORMAT = DYNAMIC;
) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '拼多多订单明细表' ROW_FORMAT = DYNAMIC;
-- ----------------------------
-- Records of oms_pdd_order_item

2
serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/mapper/OGoodsBrandMapper.java → mapper/src/main/java/cn/qihangerp/mapper/OGoodsBrandMapper.java
View File

@ -1,4 +1,4 @@
package cn.qihangerp.module.goods.mapper;
package cn.qihangerp.mapper;
import cn.qihangerp.model.entity.OGoodsBrand;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;

2
serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/mapper/OGoodsCategoryAttributeMapper.java → mapper/src/main/java/cn/qihangerp/mapper/OGoodsCategoryAttributeMapper.java
View File

@ -1,4 +1,4 @@
package cn.qihangerp.module.goods.mapper;
package cn.qihangerp.mapper;
import cn.qihangerp.model.entity.OGoodsCategoryAttribute;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;

2
serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/mapper/OGoodsCategoryAttributeValueMapper.java → mapper/src/main/java/cn/qihangerp/mapper/OGoodsCategoryAttributeValueMapper.java
View File

@ -1,4 +1,4 @@
package cn.qihangerp.module.goods.mapper;
package cn.qihangerp.mapper;
import cn.qihangerp.model.entity.OGoodsCategoryAttributeValue;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;

2
serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/mapper/OGoodsCategoryMapper.java → mapper/src/main/java/cn/qihangerp/mapper/OGoodsCategoryMapper.java
View File

@ -1,4 +1,4 @@
package cn.qihangerp.module.goods.mapper;
package cn.qihangerp.mapper;
import cn.qihangerp.model.entity.OGoodsCategory;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;

2
serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/mapper/OGoodsInventoryBatchMapper.java → mapper/src/main/java/cn/qihangerp/mapper/OGoodsInventoryBatchMapper.java
View File

@ -1,4 +1,4 @@
package cn.qihangerp.module.goods.mapper;
package cn.qihangerp.mapper;
import cn.qihangerp.model.entity.OGoodsInventoryBatch;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;

2
serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/mapper/OGoodsInventoryMapper.java → mapper/src/main/java/cn/qihangerp/mapper/OGoodsInventoryMapper.java
View File

@ -1,4 +1,4 @@
package cn.qihangerp.module.goods.mapper;
package cn.qihangerp.mapper;
import cn.qihangerp.model.entity.OGoodsInventory;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;

2
serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/mapper/OGoodsMapper.java → mapper/src/main/java/cn/qihangerp/mapper/OGoodsMapper.java
View File

@ -1,4 +1,4 @@
package cn.qihangerp.module.goods.mapper;
package cn.qihangerp.mapper;
import cn.qihangerp.model.entity.OGoods;
import cn.qihangerp.model.vo.GoodsSpecListVo;

2
serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/mapper/OGoodsSkuAttrMapper.java → mapper/src/main/java/cn/qihangerp/mapper/OGoodsSkuAttrMapper.java
View File

@ -1,4 +1,4 @@
package cn.qihangerp.module.goods.mapper;
package cn.qihangerp.mapper;
import cn.qihangerp.model.entity.OGoodsSkuAttr;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;

2
serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/mapper/OGoodsSkuMapper.java → mapper/src/main/java/cn/qihangerp/mapper/OGoodsSkuMapper.java
View File

@ -1,4 +1,4 @@
package cn.qihangerp.module.goods.mapper;
package cn.qihangerp.mapper;
import cn.qihangerp.model.entity.OGoodsSku;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;

2
serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/mapper/OGoodsSupplierMapper.java → mapper/src/main/java/cn/qihangerp/mapper/OGoodsSupplierMapper.java
View File

@ -1,4 +1,4 @@
package cn.qihangerp.module.goods.mapper;
package cn.qihangerp.mapper;
import cn.qihangerp.model.entity.OGoodsSupplier;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;

2
serviceImpl/goods/src/main/resources/mapper/OGoodsBrandMapper.xml → mapper/src/main/resources/mapper/OGoodsBrandMapper.xml
View File

@ -2,7 +2,7 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cn.qihangerp.module.goods.mapper.OGoodsBrandMapper">
<mapper namespace="cn.qihangerp.mapper.OGoodsBrandMapper">
<resultMap id="BaseResultMap" type="cn.qihangerp.model.entity.OGoodsBrand">
<id property="id" column="id" jdbcType="INTEGER"/>

2
serviceImpl/goods/src/main/resources/mapper/OGoodsCategoryAttributeMapper.xml → mapper/src/main/resources/mapper/OGoodsCategoryAttributeMapper.xml
View File

@ -2,7 +2,7 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cn.qihangerp.module.goods.mapper.OGoodsCategoryAttributeMapper">
<mapper namespace="cn.qihangerp.mapper.OGoodsCategoryAttributeMapper">
<resultMap id="BaseResultMap" type="cn.qihangerp.model.entity.OGoodsCategoryAttribute">
<id property="id" column="id" jdbcType="INTEGER"/>

2
serviceImpl/goods/src/main/resources/mapper/OGoodsCategoryAttributeValueMapper.xml → mapper/src/main/resources/mapper/OGoodsCategoryAttributeValueMapper.xml
View File

@ -2,7 +2,7 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cn.qihangerp.module.goods.mapper.OGoodsCategoryAttributeValueMapper">
<mapper namespace="cn.qihangerp.mapper.OGoodsCategoryAttributeValueMapper">
<resultMap id="BaseResultMap" type="cn.qihangerp.model.entity.OGoodsCategoryAttributeValue">
<id property="id" column="id" jdbcType="INTEGER"/>

2
serviceImpl/goods/src/main/resources/mapper/OGoodsCategoryMapper.xml → mapper/src/main/resources/mapper/OGoodsCategoryMapper.xml
View File

@ -2,7 +2,7 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cn.qihangerp.module.goods.mapper.OGoodsCategoryMapper">
<mapper namespace="cn.qihangerp.mapper.OGoodsCategoryMapper">
<resultMap id="BaseResultMap" type="cn.qihangerp.model.entity.OGoodsCategory">
<id property="id" column="id" jdbcType="INTEGER"/>

2
serviceImpl/goods/src/main/resources/mapper/OGoodsInventoryBatchMapper.xml → mapper/src/main/resources/mapper/OGoodsInventoryBatchMapper.xml
View File

@ -2,7 +2,7 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cn.qihangerp.module.goods.mapper.OGoodsInventoryBatchMapper">
<mapper namespace="cn.qihangerp.mapper.OGoodsInventoryBatchMapper">
<resultMap id="BaseResultMap" type="cn.qihangerp.model.entity.OGoodsInventoryBatch">
<id property="id" column="id" jdbcType="BIGINT"/>

2
serviceImpl/goods/src/main/resources/mapper/OGoodsInventoryMapper.xml → mapper/src/main/resources/mapper/OGoodsInventoryMapper.xml
View File

@ -2,7 +2,7 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cn.qihangerp.module.goods.mapper.OGoodsInventoryMapper">
<mapper namespace="cn.qihangerp.mapper.OGoodsInventoryMapper">
<resultMap id="BaseResultMap" type="cn.qihangerp.model.entity.OGoodsInventory">
<id property="id" column="id" jdbcType="BIGINT"/>

2
serviceImpl/goods/src/main/resources/mapper/OGoodsMapper.xml → mapper/src/main/resources/mapper/OGoodsMapper.xml
View File

@ -2,7 +2,7 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cn.qihangerp.module.goods.mapper.OGoodsMapper">
<mapper namespace="cn.qihangerp.mapper.OGoodsMapper">
<resultMap id="BaseResultMap" type="cn.qihangerp.model.entity.OGoods">
<id property="id" column="id" jdbcType="BIGINT"/>

2
serviceImpl/goods/src/main/resources/mapper/OGoodsSkuAttrMapper.xml → mapper/src/main/resources/mapper/OGoodsSkuAttrMapper.xml
View File

@ -2,7 +2,7 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cn.qihangerp.module.goods.mapper.OGoodsSkuAttrMapper">
<mapper namespace="cn.qihangerp.mapper.OGoodsSkuAttrMapper">
<resultMap id="BaseResultMap" type="cn.qihangerp.model.entity.OGoodsSkuAttr">
<id property="id" column="id" jdbcType="BIGINT"/>

2
serviceImpl/goods/src/main/resources/mapper/OGoodsSkuMapper.xml → mapper/src/main/resources/mapper/OGoodsSkuMapper.xml
View File

@ -2,7 +2,7 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cn.qihangerp.module.goods.mapper.OGoodsSkuMapper">
<mapper namespace="cn.qihangerp.mapper.OGoodsSkuMapper">
<resultMap id="BaseResultMap" type="cn.qihangerp.model.entity.OGoodsSku">
<id property="id" column="id" jdbcType="BIGINT"/>

2
serviceImpl/goods/src/main/resources/mapper/OGoodsSupplierMapper.xml → mapper/src/main/resources/mapper/OGoodsSupplierMapper.xml
View File

@ -2,7 +2,7 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cn.qihangerp.module.goods.mapper.OGoodsSupplierMapper">
<mapper namespace="cn.qihangerp.mapper.OGoodsSupplierMapper">
<resultMap id="BaseResultMap" type="cn.qihangerp.model.entity.OGoodsSupplier">
<id property="id" column="id" jdbcType="BIGINT"/>

3
model/src/main/java/cn/qihangerp/model/entity/PddOrderItem.java
View File

@ -74,8 +74,5 @@ public class PddOrderItem implements Serializable {
* 备注
*/
private String remark;
private String oGoodsId;
private String oGoodsSkuId;
private static final long serialVersionUID = 1L;
}

2
serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/ErpShipmentItemService.java → service/src/main/java/cn/qihangerp/module/service/ErpShipmentItemService.java
View File

@ -1,4 +1,4 @@
package cn.qihangerp.module.order.service;
package cn.qihangerp.module.service;
import cn.qihangerp.model.entity.OShipmentItem;
import com.baomidou.mybatisplus.extension.service.IService;

2
serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/ErpShipmentService.java → service/src/main/java/cn/qihangerp/module/service/ErpShipmentService.java
View File

@ -1,4 +1,4 @@
package cn.qihangerp.module.order.service;
package cn.qihangerp.module.service;
import cn.qihangerp.common.PageQuery;
import cn.qihangerp.common.PageResult;

2
serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/OAfterSaleService.java → service/src/main/java/cn/qihangerp/module/service/OAfterSaleService.java
View File

@ -1,4 +1,4 @@
package cn.qihangerp.module.order.service;
package cn.qihangerp.module.service;
import cn.qihangerp.common.PageQuery;
import cn.qihangerp.common.PageResult;

2
serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/OOrderItemService.java → service/src/main/java/cn/qihangerp/module/service/OOrderItemService.java
View File

@ -1,4 +1,4 @@
package cn.qihangerp.module.order.service;
package cn.qihangerp.module.service;
import cn.qihangerp.common.PageQuery;

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

@ -1,4 +1,4 @@
package cn.qihangerp.module.order.service;
package cn.qihangerp.module.service;
import cn.qihangerp.model.request.OrderSearchRequest;
import cn.qihangerp.model.entity.OOrder;
@ -25,7 +25,6 @@ public interface OOrderService extends IService<OOrder> {
ResultVo<Integer> jdOrderMessage(String orderId, JSONObject orderDetail);
ResultVo<Integer> taoOrderMessage(String tid,JSONObject orderDetail );
ResultVo<Long> pddOrderMessage(String orderSn,JSONObject orderDetail );
ResultVo<Integer> douOrderMessage(String orderId,JSONObject orderDetail );
ResultVo<Integer> offlineOrderMessage(String orderNum);
ResultVo<Integer> weiOrderMessage(String orderNum,JSONObject orderDetail );

2
serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/OOrderShipListItemService.java → service/src/main/java/cn/qihangerp/module/service/OOrderShipListItemService.java
View File

@ -1,4 +1,4 @@
package cn.qihangerp.module.order.service;
package cn.qihangerp.module.service;
import cn.qihangerp.common.PageQuery;
import cn.qihangerp.common.PageResult;

2
serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/OOrderShipListService.java → service/src/main/java/cn/qihangerp/module/service/OOrderShipListService.java
View File

@ -1,4 +1,4 @@
package cn.qihangerp.module.order.service;
package cn.qihangerp.module.service;
import cn.qihangerp.common.PageQuery;
import cn.qihangerp.common.PageResult;

2
serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/ORefundService.java → service/src/main/java/cn/qihangerp/module/service/ORefundService.java
View File

@ -1,4 +1,4 @@
package cn.qihangerp.module.order.service;
package cn.qihangerp.module.service;
import cn.qihangerp.model.entity.ORefund;

0
serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/OShipStockUpService1.java → service/src/main/java/cn/qihangerp/module/service/OShipStockUpService1.java
View File

2
serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/OShipWaybillService.java → service/src/main/java/cn/qihangerp/module/service/OShipWaybillService.java
View File

@ -1,4 +1,4 @@
package cn.qihangerp.module.order.service;
package cn.qihangerp.module.service;
import cn.qihangerp.model.entity.OShipWaybill;
import com.baomidou.mybatisplus.extension.service.IService;

2
serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/OfflineGoodsSkuService.java → service/src/main/java/cn/qihangerp/module/service/OfflineGoodsSkuService.java
View File

@ -1,4 +1,4 @@
package cn.qihangerp.module.order.service;
package cn.qihangerp.module.service;
import cn.qihangerp.common.PageQuery;
import cn.qihangerp.common.PageResult;

2
serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/OfflineOrderItemService.java → service/src/main/java/cn/qihangerp/module/service/OfflineOrderItemService.java
View File

@ -1,4 +1,4 @@
package cn.qihangerp.module.order.service;
package cn.qihangerp.module.service;
import cn.qihangerp.model.entity.OfflineOrderItem;

2
serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/OfflineOrderService.java → service/src/main/java/cn/qihangerp/module/service/OfflineOrderService.java
View File

@ -1,4 +1,4 @@
package cn.qihangerp.module.order.service;
package cn.qihangerp.module.service;
import cn.qihangerp.common.PageQuery;
import cn.qihangerp.common.PageResult;

2
serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/OfflineRefundService.java → service/src/main/java/cn/qihangerp/module/service/OfflineRefundService.java
View File

@ -1,4 +1,4 @@
package cn.qihangerp.module.order.service;
package cn.qihangerp.module.service;
import cn.qihangerp.common.PageQuery;
import cn.qihangerp.common.PageResult;

4
serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/ErpShipmentItemServiceImpl.java → service/src/main/java/cn/qihangerp/module/service/impl/ErpShipmentItemServiceImpl.java
View File

@ -1,8 +1,8 @@
package cn.qihangerp.module.order.service.impl;
package cn.qihangerp.module.service.impl;
import cn.qihangerp.model.entity.OShipmentItem;
import cn.qihangerp.mapper.OShipmentItemMapper;
import cn.qihangerp.module.order.service.ErpShipmentItemService;
import cn.qihangerp.module.service.ErpShipmentItemService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;

4
serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/ErpShipmentServiceImpl.java → service/src/main/java/cn/qihangerp/module/service/impl/ErpShipmentServiceImpl.java
View File

@ -1,4 +1,4 @@
package cn.qihangerp.module.order.service.impl;
package cn.qihangerp.module.service.impl;
import cn.qihangerp.common.PageQuery;
import cn.qihangerp.common.PageResult;
@ -12,7 +12,7 @@ import cn.qihangerp.model.entity.OShipmentItem;
import cn.qihangerp.model.bo.OrderShipBo;
import cn.qihangerp.mapper.OShipmentItemMapper;
import cn.qihangerp.mapper.OShipmentMapper;
import cn.qihangerp.module.order.service.ErpShipmentService;
import cn.qihangerp.module.service.ErpShipmentService;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;

4
serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/OAfterSaleServiceImpl.java → service/src/main/java/cn/qihangerp/module/service/impl/OAfterSaleServiceImpl.java
View File

@ -1,10 +1,10 @@
package cn.qihangerp.module.order.service.impl;
package cn.qihangerp.module.service.impl;
import cn.qihangerp.common.PageQuery;
import cn.qihangerp.common.PageResult;
import cn.qihangerp.model.entity.OAfterSale;
import cn.qihangerp.mapper.OAfterSaleMapper;
import cn.qihangerp.module.order.service.OAfterSaleService;
import cn.qihangerp.module.service.OAfterSaleService;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;

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

@ -1,14 +1,13 @@
package cn.qihangerp.module.order.service.impl;
package cn.qihangerp.module.service.impl;
import cn.qihangerp.mapper.OGoodsSkuMapper;
import cn.qihangerp.model.entity.OGoodsSku;
import cn.qihangerp.model.entity.OOrderItem;
import cn.qihangerp.module.goods.mapper.OGoodsSkuMapper;
import cn.qihangerp.model.bo.OrderItemListBo;
import cn.qihangerp.model.vo.OrderItemListVo;
import cn.qihangerp.model.vo.SalesTopSkuVo;
import cn.qihangerp.mapper.OOrderItemMapper;
import cn.qihangerp.module.order.service.OOrderItemService;
import cn.qihangerp.module.service.OOrderItemService;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;

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

@ -1,17 +1,16 @@
package cn.qihangerp.module.order.service.impl;
package cn.qihangerp.module.service.impl;
import cn.qihangerp.mapper.*;
import cn.qihangerp.model.entity.*;
import cn.qihangerp.model.request.OrderSearchRequest;
import cn.qihangerp.module.goods.mapper.OGoodsMapper;
import cn.qihangerp.module.goods.mapper.OGoodsSkuMapper;
import cn.qihangerp.module.goods.mapper.OGoodsSupplierMapper;
import cn.qihangerp.mapper.OGoodsMapper;
import cn.qihangerp.mapper.OGoodsSkuMapper;
import cn.qihangerp.mapper.OGoodsSupplierMapper;
import cn.qihangerp.model.bo.OrderAllocateShipRequest;
import cn.qihangerp.model.bo.OrderShipRequest;
import cn.qihangerp.model.vo.OrderDiscountVo;
import cn.qihangerp.model.vo.SalesDailyVo;
import cn.qihangerp.module.order.service.OOrderService;
import cn.qihangerp.module.order.service.msg.PddOrderMessageService;
import cn.qihangerp.module.service.OOrderService;
import com.alibaba.fastjson2.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@ -21,7 +20,6 @@ import cn.qihangerp.common.PageResult;
import cn.qihangerp.common.ResultVo;
import cn.qihangerp.common.ResultVoEnum;
import cn.qihangerp.common.enums.EnumShopType;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
@ -57,7 +55,7 @@ public class OOrderServiceImpl extends ServiceImpl<OOrderMapper, OOrder>
private final OfflineOrderMapper offlineOrderMapper;
private final OfflineOrderItemMapper offlineOrderItemMapper;
private final PddOrderMessageService pddOrderMessageService;
private final String DATE_PATTERN =
@ -82,13 +80,6 @@ public class OOrderServiceImpl extends ServiceImpl<OOrderMapper, OOrder>
}
@Transactional
@Override
public ResultVo<Long> pddOrderMessage(String orderSn,JSONObject orderDetail ) {
log.info("=====pdd order message===订单号{}===", orderSn);
return pddOrderMessageService.pddOrderMessage(orderSn, orderDetail);
}
@Transactional
@Override
public ResultVo<Integer> douOrderMessage(String orderId,JSONObject orderDetail ) {

6
serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/OOrderShipListItemServiceImpl.java → service/src/main/java/cn/qihangerp/module/service/impl/OOrderShipListItemServiceImpl.java
View File

@ -1,16 +1,16 @@
package cn.qihangerp.module.order.service.impl;
package cn.qihangerp.module.service.impl;
import cn.qihangerp.common.PageQuery;
import cn.qihangerp.common.PageResult;
import cn.qihangerp.common.ResultVo;
import cn.qihangerp.model.entity.OGoodsSku;
import cn.qihangerp.module.goods.mapper.OGoodsSkuMapper;
import cn.qihangerp.mapper.OGoodsSkuMapper;
import cn.qihangerp.model.bo.ShipStockUpBo;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import cn.qihangerp.model.entity.OOrderShipListItem;
import cn.qihangerp.module.order.service.OOrderShipListItemService;
import cn.qihangerp.module.service.OOrderShipListItemService;
import cn.qihangerp.mapper.OOrderShipListItemMapper;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;

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

@ -1,4 +1,4 @@
package cn.qihangerp.module.order.service.impl;
package cn.qihangerp.module.service.impl;
import cn.qihangerp.common.PageQuery;
import cn.qihangerp.common.PageResult;
@ -19,7 +19,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import cn.qihangerp.model.entity.OOrderShipList;
import cn.qihangerp.module.order.service.OOrderShipListService;
import cn.qihangerp.module.service.OOrderShipListService;
import cn.qihangerp.mapper.OOrderShipListMapper;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@ -141,7 +141,6 @@ public class OOrderShipListServiceImpl extends ServiceImpl<OOrderShipListMapper,
OOrderItem updateOrderItem =new OOrderItem();
updateOrderItem.setId(item.getOrderItemId().toString());
updateOrderItem.setShipStatus(2);
updateOrderItem.setOrderStatus(2);
updateOrderItem.setUpdateBy("供应商发货手动确认");
updateOrderItem.setUpdateTime(new Date());
orderItemMapper.updateById(updateOrderItem);
@ -157,7 +156,6 @@ public class OOrderShipListServiceImpl extends ServiceImpl<OOrderShipListMapper,
OOrder update = new OOrder();
update.setId(shipOrder.getOrderId().toString());
update.setShipStatus(2);//发货状态 0 待发货 1 部分发货 2全部发货
update.setOrderStatus(2);
update.setShipCompany(erpLogisticsCompany.getName());
update.setShipCode(bo.getLogisticsCode());
update.setUpdateTime(new Date());
@ -173,7 +171,6 @@ public class OOrderShipListServiceImpl extends ServiceImpl<OOrderShipListMapper,
OOrder update = new OOrder();
update.setId(shipOrder.getOrderId().toString());
update.setShipStatus(1);//发货状态 0 待发货 1 部分发货 2全部发货
// update.setOrderStatus(2);
update.setShipCompany(erpLogisticsCompany.getName());
update.setShipCode(bo.getLogisticsCode());
update.setUpdateTime(new Date());

10
serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/ORefundServiceImpl.java → service/src/main/java/cn/qihangerp/module/service/impl/ORefundServiceImpl.java
View File

@ -1,14 +1,10 @@
package cn.qihangerp.module.order.service.impl;
package cn.qihangerp.module.service.impl;
import cn.qihangerp.common.PageQuery;
import cn.qihangerp.common.PageResult;
import cn.qihangerp.common.ResultVo;
import cn.qihangerp.model.entity.OGoodsSku;
import cn.qihangerp.module.goods.mapper.OGoodsSkuMapper;
import cn.qihangerp.mapper.OGoodsSkuMapper;
import cn.qihangerp.model.entity.OAfterSale;
import cn.qihangerp.model.entity.OOrder;
import cn.qihangerp.model.entity.OOrderItem;
@ -19,7 +15,7 @@ import cn.qihangerp.mapper.OAfterSaleMapper;
import cn.qihangerp.mapper.OOrderItemMapper;
import cn.qihangerp.mapper.OOrderMapper;
import cn.qihangerp.mapper.ORefundMapper;
import cn.qihangerp.module.order.service.ORefundService;
import cn.qihangerp.module.service.ORefundService;
import com.alibaba.fastjson2.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

0
serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/OShipStockUpServiceImpl1.java → service/src/main/java/cn/qihangerp/module/service/impl/OShipStockUpServiceImpl1.java
View File

4
serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/OShipWaybillServiceImpl.java → service/src/main/java/cn/qihangerp/module/service/impl/OShipWaybillServiceImpl.java
View File

@ -1,8 +1,8 @@
package cn.qihangerp.module.order.service.impl;
package cn.qihangerp.module.service.impl;
import cn.qihangerp.model.entity.OShipWaybill;
import cn.qihangerp.mapper.OShipWaybillMapper;
import cn.qihangerp.module.order.service.OShipWaybillService;
import cn.qihangerp.module.service.OShipWaybillService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;

9
serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/OfflineGoodsSkuServiceImpl.java → service/src/main/java/cn/qihangerp/module/service/impl/OfflineGoodsSkuServiceImpl.java
View File

@ -1,13 +1,10 @@
package cn.qihangerp.module.order.service.impl;
package cn.qihangerp.module.service.impl;
import cn.qihangerp.model.entity.OGoodsSku;
import cn.qihangerp.module.goods.mapper.OGoodsSkuMapper;
import cn.qihangerp.mapper.OGoodsSkuMapper;
import cn.qihangerp.model.entity.OfflineGoodsSku;
import cn.qihangerp.mapper.OfflineGoodsSkuMapper;
import cn.qihangerp.module.order.service.OfflineGoodsSkuService;
import cn.qihangerp.module.service.OfflineGoodsSkuService;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;

4
serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/OfflineOrderItemServiceImpl.java → service/src/main/java/cn/qihangerp/module/service/impl/OfflineOrderItemServiceImpl.java
View File

@ -1,8 +1,8 @@
package cn.qihangerp.module.order.service.impl;
package cn.qihangerp.module.service.impl;
import cn.qihangerp.model.entity.OfflineOrderItem;
import cn.qihangerp.mapper.OfflineOrderItemMapper;
import cn.qihangerp.module.order.service.OfflineOrderItemService;
import cn.qihangerp.module.service.OfflineOrderItemService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;

4
serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/OfflineOrderServiceImpl.java → service/src/main/java/cn/qihangerp/module/service/impl/OfflineOrderServiceImpl.java
View File

@ -1,4 +1,4 @@
package cn.qihangerp.module.order.service.impl;
package cn.qihangerp.module.service.impl;
import cn.qihangerp.model.request.OrderSearchRequest;
import cn.qihangerp.model.entity.OfflineOrder;
@ -8,7 +8,7 @@ import cn.qihangerp.model.bo.OfflineOrderCreateItemBo;
import cn.qihangerp.model.bo.OfflineOrderShipBo;
import cn.qihangerp.mapper.OfflineOrderItemMapper;
import cn.qihangerp.mapper.OfflineOrderMapper;
import cn.qihangerp.module.order.service.OfflineOrderService;
import cn.qihangerp.module.service.OfflineOrderService;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;

4
serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/OfflineRefundServiceImpl.java → service/src/main/java/cn/qihangerp/module/service/impl/OfflineRefundServiceImpl.java
View File

@ -1,11 +1,11 @@
package cn.qihangerp.module.order.service.impl;
package cn.qihangerp.module.service.impl;
import cn.qihangerp.common.PageQuery;
import cn.qihangerp.common.PageResult;
import cn.qihangerp.model.request.RefundSearchRequest;
import cn.qihangerp.model.entity.OfflineRefund;
import cn.qihangerp.mapper.OfflineRefundMapper;
import cn.qihangerp.module.order.service.OfflineRefundService;
import cn.qihangerp.module.service.OfflineRefundService;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;

6
serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/service/impl/DouGoodsServiceImpl.java
View File

@ -8,9 +8,9 @@ import cn.qihangerp.common.utils.StringUtils;
import cn.qihangerp.model.entity.OGoods;
import cn.qihangerp.model.entity.OGoodsInventory;
import cn.qihangerp.model.entity.OGoodsSku;
import cn.qihangerp.module.goods.mapper.OGoodsInventoryMapper;
import cn.qihangerp.module.goods.mapper.OGoodsMapper;
import cn.qihangerp.module.goods.mapper.OGoodsSkuMapper;
import cn.qihangerp.mapper.OGoodsInventoryMapper;
import cn.qihangerp.mapper.OGoodsMapper;
import cn.qihangerp.mapper.OGoodsSkuMapper;
import cn.qihangerp.model.entity.DouGoods;
import cn.qihangerp.model.entity.DouGoodsSku;
import cn.qihangerp.model.bo.DouGoodsBo;

2
serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/impl/OGoodsBrandServiceImpl.java
View File

@ -7,7 +7,7 @@ import cn.qihangerp.common.PageQuery;
import cn.qihangerp.common.PageResult;
import cn.qihangerp.model.entity.OGoodsBrand;
import cn.qihangerp.module.goods.service.OGoodsBrandService;
import cn.qihangerp.module.goods.mapper.OGoodsBrandMapper;
import cn.qihangerp.mapper.OGoodsBrandMapper;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;

2
serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/impl/OGoodsCategoryAttributeServiceImpl.java
View File

@ -3,7 +3,7 @@ package cn.qihangerp.module.goods.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import cn.qihangerp.model.entity.OGoodsCategoryAttribute;
import cn.qihangerp.module.goods.service.OGoodsCategoryAttributeService;
import cn.qihangerp.module.goods.mapper.OGoodsCategoryAttributeMapper;
import cn.qihangerp.mapper.OGoodsCategoryAttributeMapper;
import org.springframework.stereotype.Service;
/**

2
serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/impl/OGoodsCategoryAttributeValueServiceImpl.java
View File

@ -3,7 +3,7 @@ package cn.qihangerp.module.goods.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import cn.qihangerp.model.entity.OGoodsCategoryAttributeValue;
import cn.qihangerp.module.goods.service.OGoodsCategoryAttributeValueService;
import cn.qihangerp.module.goods.mapper.OGoodsCategoryAttributeValueMapper;
import cn.qihangerp.mapper.OGoodsCategoryAttributeValueMapper;
import org.springframework.stereotype.Service;
/**

6
serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/impl/OGoodsCategoryServiceImpl.java
View File

@ -2,12 +2,12 @@ package cn.qihangerp.module.goods.service.impl;
import cn.qihangerp.model.entity.OGoodsCategoryAttribute;
import cn.qihangerp.model.entity.OGoodsCategoryAttributeValue;
import cn.qihangerp.module.goods.mapper.OGoodsCategoryAttributeMapper;
import cn.qihangerp.module.goods.mapper.OGoodsCategoryAttributeValueMapper;
import cn.qihangerp.mapper.OGoodsCategoryAttributeMapper;
import cn.qihangerp.mapper.OGoodsCategoryAttributeValueMapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import cn.qihangerp.model.entity.OGoodsCategory;
import cn.qihangerp.module.goods.service.OGoodsCategoryService;
import cn.qihangerp.module.goods.mapper.OGoodsCategoryMapper;
import cn.qihangerp.mapper.OGoodsCategoryMapper;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

2
serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/impl/OGoodsInventoryBatchServiceImpl.java
View File

@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import cn.qihangerp.model.entity.OGoodsInventoryBatch;
import cn.qihangerp.module.goods.service.OGoodsInventoryBatchService;
import cn.qihangerp.module.goods.mapper.OGoodsInventoryBatchMapper;
import cn.qihangerp.mapper.OGoodsInventoryBatchMapper;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;

2
serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/impl/OGoodsInventoryServiceImpl.java
View File

@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import cn.qihangerp.model.entity.OGoodsInventory;
import cn.qihangerp.module.goods.service.OGoodsInventoryService;
import cn.qihangerp.module.goods.mapper.OGoodsInventoryMapper;
import cn.qihangerp.mapper.OGoodsInventoryMapper;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;

8
serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/impl/OGoodsServiceImpl.java
View File

@ -3,12 +3,12 @@ package cn.qihangerp.module.goods.service.impl;
import cn.qihangerp.model.entity.OGoodsInventory;
import cn.qihangerp.model.entity.OGoodsSku;
import cn.qihangerp.model.vo.GoodsSpecListVo;
import cn.qihangerp.module.goods.mapper.OGoodsInventoryMapper;
import cn.qihangerp.module.goods.mapper.OGoodsMapper;
import cn.qihangerp.module.goods.mapper.OGoodsSkuAttrMapper;
import cn.qihangerp.mapper.OGoodsInventoryMapper;
import cn.qihangerp.mapper.OGoodsMapper;
import cn.qihangerp.mapper.OGoodsSkuAttrMapper;
import cn.qihangerp.module.goods.mapper.OGoodsSkuMapper;
import cn.qihangerp.mapper.OGoodsSkuMapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;

2
serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/impl/OGoodsSkuAttrServiceImpl.java
View File

@ -3,7 +3,7 @@ package cn.qihangerp.module.goods.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import cn.qihangerp.model.entity.OGoodsSkuAttr;
import cn.qihangerp.module.goods.service.OGoodsSkuAttrService;
import cn.qihangerp.module.goods.mapper.OGoodsSkuAttrMapper;
import cn.qihangerp.mapper.OGoodsSkuAttrMapper;
import org.springframework.stereotype.Service;
/**

2
serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/impl/OGoodsSkuServiceImpl.java
View File

@ -1,7 +1,7 @@
package cn.qihangerp.module.goods.service.impl;
import cn.qihangerp.model.entity.OGoodsSku;
import cn.qihangerp.module.goods.mapper.OGoodsSkuMapper;
import cn.qihangerp.mapper.OGoodsSkuMapper;
import cn.qihangerp.module.goods.service.OGoodsSkuService;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;

2
serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/impl/OGoodsSupplierServiceImpl.java
View File

@ -7,7 +7,7 @@ import cn.qihangerp.common.PageQuery;
import cn.qihangerp.common.PageResult;
import cn.qihangerp.model.entity.OGoodsSupplier;
import cn.qihangerp.module.goods.service.OGoodsSupplierService;
import cn.qihangerp.module.goods.mapper.OGoodsSupplierMapper;
import cn.qihangerp.mapper.OGoodsSupplierMapper;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;

6
serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdGoodsServiceImpl.java
View File

@ -5,9 +5,9 @@ import cn.qihangerp.common.ResultVoEnum;
import cn.qihangerp.model.entity.OGoods;
import cn.qihangerp.model.entity.OGoodsInventory;
import cn.qihangerp.model.entity.OGoodsSku;
import cn.qihangerp.module.goods.mapper.OGoodsInventoryMapper;
import cn.qihangerp.module.goods.mapper.OGoodsMapper;
import cn.qihangerp.module.goods.mapper.OGoodsSkuMapper;
import cn.qihangerp.mapper.OGoodsInventoryMapper;
import cn.qihangerp.mapper.OGoodsMapper;
import cn.qihangerp.mapper.OGoodsSkuMapper;
import com.alibaba.fastjson2.JSONArray;
import com.alibaba.fastjson2.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;

414
serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/msg/PddOrderMessageService.java
View File

@ -1,414 +0,0 @@
package cn.qihangerp.module.order.service.msg;
import cn.qihangerp.common.ResultVo;
import cn.qihangerp.common.enums.EnumOOrderStatus;
import cn.qihangerp.common.enums.EnumShopType;
import cn.qihangerp.common.utils.StringUtils;
import cn.qihangerp.model.entity.OOrder;
import cn.qihangerp.model.entity.OOrderItem;
import cn.qihangerp.mapper.OOrderItemMapper;
import cn.qihangerp.mapper.OOrderMapper;
import com.alibaba.fastjson2.JSONArray;
import com.alibaba.fastjson2.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.Date;
import java.util.List;
@Slf4j
@AllArgsConstructor
@Service
public class PddOrderMessageService {
private final OOrderMapper orderMapper;
private final OOrderItemMapper orderItemMapper;
@Transactional
public ResultVo<Long> pddOrderMessage(String orderSn, JSONObject orderDetail ) {
log.info("=====pdd order message===订单号{}==="+orderSn);
// JSONObject jsonObject = pddApiService.getOrderDetail(orderSn);
// if(jsonObject.getInteger("code")!=200 || jsonObject.getJSONObject("data") ==null){
// log.info("=====pdd order message===没有找到订单");
// return ResultVo.error(404,"没有找到订单");
// }
//
// JSONObject orderDetail = jsonObject.getJSONObject("data");
// log.info("=====pdd order message===订单:"+JSONObject.toJSONString(orderDetail));
if(orderDetail == null) {
log.info("=====pdd order message===没有找到订单=======");
return ResultVo.error("没有找到订单");
}
JSONArray itemArray = orderDetail.getJSONArray("items");
if (itemArray.isEmpty()) {
// TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
log.info("=====pdd order message===没有items====事务回滚=======");
return ResultVo.error("没有找到订单items");
}
// List<PddOrder> originOrders = pddOrderMapper.selectList(new LambdaQueryWrapper<PddOrder>().eq(PddOrder::getOrderSn, orderSn));
//
// if(originOrders == null || originOrders.size() == 0) {
// // 没有找到订单信息
// return ResultVo.error(ResultVoEnum.NotFound,"没有找到PDD原始订单："+orderSn);
// }
// PddOrder originOrder = originOrders.get(0);
// PddOrder originOrder = new PddOrder();
Long shopId = orderDetail.getLong("shopId");
List<OOrder> oOrders = orderMapper.selectList(new LambdaQueryWrapper<OOrder>()
.eq(OOrder::getOrderNum, orderSn).eq(OOrder::getShopId,shopId));
if(oOrders == null || oOrders.isEmpty()) {
// 新增订单
OOrder insert = new OOrder();
insert.setOrderNum(orderSn);
insert.setShopType(EnumShopType.PDD.getIndex());
insert.setShopId(shopId);
insert.setBuyerMemo(orderDetail.getString("buyerMemo"));
insert.setSellerMemo(orderDetail.getString("remark"));
Integer originOrderStatus = orderDetail.getInteger("orderStatus");
Integer originRefundStatus = orderDetail.getInteger("refundStatus");
Integer afterSalesStatus = orderDetail.getInteger("afterSalesStatus");
String platformStatusDesc = "未知";
// 状态 订单状态0：新订单，1：待发货，2：已发货，3：已完成，11已取消；12退款中；21待付款；22锁定，29删除
int orderStatus = 0;
int refundStatus = -1;
if (originRefundStatus == 1) {
// 没有售后
orderStatus = originOrderStatus;
if(originOrderStatus==1) {
platformStatusDesc = "待发货";
}else if(originOrderStatus == 2){
platformStatusDesc = "已发货待签收";
}else if(originOrderStatus == 3){
platformStatusDesc = "已签收";
}
refundStatus = 1;
} else {
if (originRefundStatus == 4) {
refundStatus = 4;
orderStatus = EnumOOrderStatus.CLOSED.getIndex();
if(originOrderStatus==1) {
platformStatusDesc = "待发货-已退款";
}else if(originOrderStatus == 2){
platformStatusDesc = "已发货待签收-已退款";
}else if(originOrderStatus == 3){
platformStatusDesc = "已签收-已退款";
}
} else {
refundStatus = originRefundStatus;
orderStatus = EnumOOrderStatus.REFUND.getIndex();
if(originOrderStatus==1) {
platformStatusDesc = "待发货-售后中";
}else if(originOrderStatus == 2){
platformStatusDesc = "已发货待签收-售后中";
}else if(originOrderStatus == 3){
platformStatusDesc = "已签收-售后中";
}
}
}
if(orderDetail.getInteger("riskControlStatus")==1){
orderStatus = 0;
}
insert.setRefundStatus(refundStatus);
insert.setOrderStatus(orderStatus);
// insert.setPlatformStatusCode(originOrderStatus+"-"+originRefundStatus);
// insert.setPlatformStatusDesc(platformStatusDesc);
// 价格
insert.setGoodsAmount(orderDetail.getDouble("goodsAmount"));//.getGoodsAmount());
insert.setPostFee(orderDetail.getDouble("postage"));
insert.setAmount(orderDetail.getDouble("goodsAmount"));
double payAmount = orderDetail.getDouble("payAmount");
insert.setPayment(payAmount);
double platformDiscount = orderDetail.getDouble("platformDiscount")!=null?orderDetail.getDouble("platformDiscount"):0.0;
insert.setPlatformDiscount(platformDiscount);
double sellerDiscount = orderDetail.getDouble("sellerDiscount")!=null?orderDetail.getDouble("sellerDiscount"):0.0;
insert.setSellerDiscount(sellerDiscount);
double payDiscount = orderDetail.getDouble("duoDuoPayReduction")!=null?orderDetail.getDouble("duoDuoPayReduction"):0.0;
// insert.setMerchantAmount(payAmount+platformDiscount+payDiscount);
// insert.setWaybillCode(orderDetail.getString("trackingNumber"));
insert.setReceiverName(orderDetail.getString("receiverNameMask"));
insert.setReceiverMobile(orderDetail.getString("receiverPhoneMask"));
insert.setAddress(orderDetail.getString("addressMask"));
insert.setProvince(orderDetail.getString("province"));
insert.setCity(orderDetail.getString("city"));
insert.setTown(orderDetail.getString("town"));
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
LocalDateTime dateTime = LocalDateTime.parse(orderDetail.getString("createdTime"), formatter);
insert.setOrderTime(dateTime);
// insert.setOrderModifiedTime(orderDetail.getString("updatedAt"));
// if(orderDetail.getDate("receiveTime")!=null){
// insert.setOrderFinishTime(orderDetail.getDate("receiveTime").getTime());
// }
// insert.setShipType(0);
insert.setCreateTime(new Date());
insert.setCreateBy("ORDER_MESSAGE");
// insert.setOpenAddressId(orderDetail.getString("openAddressId"));
orderMapper.insert(insert);
// 发送新订单消息
// sseService.broadcastNewOrderMessage(EnumShopType.PDD,insert.getOrderNum());
// 插入orderItem
// addPddOrderItem(insert.getId(),originOrder.getOrderSn(),orderStatus,refundStatus,platformDiscount,sellerDiscount);
// JSONArray itemArray = orderDetail.getJSONArray("items");
// if (itemArray.isEmpty()) {
// TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
// log.info("=====pdd order message===没有items====事务回滚=======");
// }
for (int i =0;i<itemArray.size();i++) {
JSONObject itemObject =itemArray.getJSONObject(i);
// Map<String,Object> itemObject = (Map<String, Object>) itemArray.get(i);
// JSONObject itemObject = (JSONObject) item;
OOrderItem orderItem = new OOrderItem();
orderItem.setShopId(insert.getShopId());
orderItem.setShopType(EnumShopType.PDD.getIndex());
// orderItem.setMerchantId(insert.getMerchantId());
// orderItem.setOrderTime(insert.getOrderTime());
orderItem.setOrderId(insert.getId());
orderItem.setOrderNum(orderSn);
orderItem.setSubOrderNum(orderSn+"-"+itemObject.getString("skuId"));
// 这里将订单商品skuid转换成erp系统的skuid
// Long erpGoodsId = 0L;
// String erpSkuId = "0";
//
// List<PddGoodsSku> pddGoodsSku = pddGoodsSkuMapper.selectList(new LambdaQueryWrapper<PddGoodsSku>().eq(PddGoodsSku::getSkuId, item.getSkuId()));
// if (pddGoodsSku != null && !pddGoodsSku.isEmpty()) {
// erpGoodsId = pddGoodsSku.get(0).getOGoodsId();
// erpSkuId = pddGoodsSku.get(0).getOGoodsSkuId();
//// orderItem.setGoodsImg(taoGoodsSku.get(0).getLogo());
//// orderItem.setGoodsSpec(jdGoodsSkus.get(0).getSkuName());
//// orderItem.setSkuNum(taoGoodsSku.get(0).getOuterId());
// }
orderItem.setSkuNum(itemObject.getString("outerId"));
orderItem.setSkuId(itemObject.getString("skuId"));
// orderItem.setProductId(itemObject.getString("goodsId"));
orderItem.setGoodsId(itemObject.getLong("erpGoodsId"));
orderItem.setGoodsSkuId(itemObject.getLong("erpGoodsSkuId"));
orderItem.setGoodsImg(itemObject.getString("goodsImg"));
orderItem.setGoodsSpec(itemObject.getString("goodsSpec"));
orderItem.setGoodsTitle(itemObject.getString("goodsName"));
orderItem.setGoodsPrice(itemObject.getDouble("goodsPrice"));
orderItem.setQuantity(itemObject.getInteger("goodsCount"));
if (i == 0) {
Double itemAmount = orderItem.getGoodsPrice() * orderItem.getQuantity() - insert.getPlatformDiscount() - insert.getSellerDiscount();
orderItem.setItemAmount(itemAmount);
orderItem.setPayment(itemAmount);
} else {
orderItem.setItemAmount(orderItem.getGoodsPrice()* orderItem.getQuantity());
orderItem.setPayment(orderItem.getGoodsPrice()* orderItem.getQuantity());
}
// orderItem.setPayment(item.getGoodsPrice());
// orderItem.setOrderStatus(orderStatus);
orderItem.setRefundStatus(refundStatus);
orderItem.setRefundCount(0);
orderItem.setCreateTime(new Date());
orderItem.setCreateBy("ORDER_MESSAGE");
orderItemMapper.insert(orderItem);
}
}else {
// 修改订单 (修改：)
OOrder update = new OOrder();
update.setId(oOrders.get(0).getId());
Integer originOrderStatus = orderDetail.getInteger("orderStatus");
Integer originRefundStatus = orderDetail.getInteger("refundStatus");
Integer afterSalesStatus = orderDetail.getInteger("afterSalesStatus");
String platformStatusDesc = "未知";
// 状态 订单状态0：新订单，1：待发货，2：已发货，3：已完成，11已取消；12退款中；21待付款；22锁定，29删除
int orderStatus = 0;
int refundStatus = -1;
if (originRefundStatus == 1) {
// 没有售后
orderStatus = originOrderStatus;
if(originOrderStatus==1) {
platformStatusDesc = "待发货";
}else if(originOrderStatus == 2){
platformStatusDesc = "已发货待签收";
}else if(originOrderStatus == 3){
platformStatusDesc = "已签收";
}
refundStatus = 1;
} else {
if (originRefundStatus == 4) {
refundStatus = 4;
orderStatus = EnumOOrderStatus.CLOSED.getIndex();
if(originOrderStatus==1) {
platformStatusDesc = "待发货-已退款";
}else if(originOrderStatus == 2){
platformStatusDesc = "已发货待签收-已退款";
}else if(originOrderStatus == 3){
platformStatusDesc = "已签收-已退款";
}
} else {
refundStatus = originRefundStatus;
orderStatus = EnumOOrderStatus.REFUND.getIndex();
if(originOrderStatus==1) {
platformStatusDesc = "待发货-售后中";
}else if(originOrderStatus == 2){
platformStatusDesc = "已发货待签收-售后中";
}else if(originOrderStatus == 3){
platformStatusDesc = "已签收-售后中";
}
}
}
if(orderDetail.getInteger("riskControlStatus")==1){
orderStatus = 0;
}
// insert.setRefundStatus(refundStatus);
update.setOrderStatus(orderStatus);
// update.setPlatformStatusCode(originOrderStatus+"-"+originRefundStatus);
// update.setPlatformStatusDesc(platformStatusDesc);
update.setShopType(EnumShopType.PDD.getIndex());
update.setShopId(orderDetail.getLong("shopId"));
// update.setMerchantId(orderDetail.getLong("merchantId"));
// 价格
update.setGoodsAmount(orderDetail.getDouble("goodsAmount"));//.getGoodsAmount());
update.setPostFee(orderDetail.getDouble("postage"));
update.setAmount(orderDetail.getDouble("goodsAmount"));
double payAmount = orderDetail.getDouble("payAmount");
update.setPayment(payAmount);
double platformDiscount = orderDetail.getDouble("platformDiscount")!=null?orderDetail.getDouble("platformDiscount"):0.0;
update.setPlatformDiscount(platformDiscount);
double sellerDiscount = orderDetail.getDouble("sellerDiscount")!=null?orderDetail.getDouble("sellerDiscount"):0.0;
update.setSellerDiscount(sellerDiscount);
double payDiscount = orderDetail.getDouble("duoDuoPayReduction")!=null?orderDetail.getDouble("duoDuoPayReduction"):0.0;
// update.setMerchantAmount(payAmount+platformDiscount+payDiscount);
if (orderStatus == 1 && refundStatus == 1) {
if (StringUtils.isNotBlank(orderDetail.getString("receiverNameMask"))) {
update.setReceiverName(orderDetail.getString("receiverNameMask"));
}
if (StringUtils.isNotBlank(orderDetail.getString("receiverPhoneMask"))) {
update.setReceiverMobile(orderDetail.getString("receiverPhoneMask"));
}
if (StringUtils.isNotBlank(orderDetail.getString("addressMask"))) {
update.setAddress(orderDetail.getString("addressMask"));
}
}
if (StringUtils.isNotBlank(orderDetail.getString("province"))) {
update.setProvince(orderDetail.getString("province"));
}
if (StringUtils.isNotBlank(orderDetail.getString("city"))) {
update.setCity(orderDetail.getString("city"));
}
if (StringUtils.isNotBlank(orderDetail.getString("town"))) {
update.setTown(orderDetail.getString("town"));
}
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
LocalDateTime dateTime = LocalDateTime.parse(orderDetail.getString("createdTime"), formatter);
update.setOrderTime(dateTime);
// update.setOrderModifiedTime(orderDetail.getString("updatedAt"));
// if(orderDetail.getDate("receiveTime")!=null){
// update.setOrderFinishTime(orderDetail.getDate("receiveTime").getTime());
// }
// update.setOpenAddressId(orderDetail.getString("openAddressId"));
// update.setWaybillCode(orderDetail.getString("trackingNumber"));
update.setUpdateTime(new Date());
update.setUpdateBy("ORDER_MESSAGE");
orderMapper.updateById(update);
// 更新发货主表数据状态
Long shipOrderId = 0L;
for (int i = 0; i < itemArray.size(); i++) {
JSONObject itemObject = itemArray.getJSONObject(i);
List<OOrderItem> oOrderItems = orderItemMapper.selectList(
new LambdaQueryWrapper<OOrderItem>().eq(OOrderItem::getOrderId, oOrders.get(0).getId())
.eq(OOrderItem::getSkuId, itemObject.getString("skuId")));
if (oOrderItems.isEmpty()) {
// 新增item
OOrderItem orderItem = new OOrderItem();
orderItem.setOrderId(oOrders.get(0).getId());
orderItem.setShopId(update.getShopId());
orderItem.setShopType(EnumShopType.PDD.getIndex());
// orderItem.setMerchantId(update.getMerchantId());
orderItem.setOrderNum(orderSn);
orderItem.setSubOrderNum(orderSn + "-" + itemObject.getString("skuId"));
orderItem.setSkuNum(itemObject.getString("outerId"));
orderItem.setSkuId(itemObject.getString("skuId"));
// orderItem.setProductId(itemObject.getString("goodsId"));
orderItem.setGoodsId(itemObject.getLong("erpGoodsId"));
orderItem.setGoodsSkuId(itemObject.getLong("erpGoodsSkuId"));
orderItem.setGoodsImg(itemObject.getString("goodsImg"));
orderItem.setGoodsSpec(itemObject.getString("goodsSpec"));
orderItem.setGoodsTitle(itemObject.getString("goodsName"));
orderItem.setGoodsPrice(itemObject.getDouble("goodsPrice"));
orderItem.setQuantity(itemObject.getInteger("goodsCount"));
if (i == 0) {
Double itemAmount = orderItem.getGoodsPrice() * orderItem.getQuantity() - oOrders.get(0).getPlatformDiscount() - oOrders.get(0).getSellerDiscount();
orderItem.setItemAmount(itemAmount);
orderItem.setPayment(itemAmount);
} else {
orderItem.setItemAmount(orderItem.getGoodsPrice() * orderItem.getQuantity());
orderItem.setPayment(orderItem.getGoodsPrice() * orderItem.getQuantity());
}
// orderItem.setOrderStatus(orderStatus);
orderItem.setRefundStatus(refundStatus);
orderItem.setRefundCount(0);
orderItem.setCreateTime(new Date());
orderItem.setCreateBy("ORDER_MESSAGE");
orderItemMapper.insert(orderItem);
} else {
// 修改、
OOrderItem orderItem = new OOrderItem();
orderItem.setId(oOrderItems.get(0).getId());
orderItem.setShopId(update.getShopId());
orderItem.setShopType(EnumShopType.PDD.getIndex());
orderItem.setSkuNum(itemObject.getString("outerId"));
orderItem.setSkuId(itemObject.getString("skuId"));
orderItem.setGoodsId(itemObject.getLong("erpGoodsId"));
orderItem.setGoodsSkuId(itemObject.getLong("erpGoodsSkuId"));
orderItem.setGoodsImg(itemObject.getString("goodsImg"));
orderItem.setGoodsSpec(itemObject.getString("goodsSpec"));
orderItem.setGoodsTitle(itemObject.getString("goodsName"));
orderItem.setGoodsPrice(itemObject.getDouble("goodsPrice"));
orderItem.setQuantity(itemObject.getInteger("goodsCount"));
if (i == 0) {
Double itemAmount = orderItem.getGoodsPrice() * orderItem.getQuantity() - oOrders.get(0).getPlatformDiscount() - oOrders.get(0).getSellerDiscount();
orderItem.setItemAmount(itemAmount);
orderItem.setPayment(itemAmount);
} else {
orderItem.setItemAmount(orderItem.getGoodsPrice() * orderItem.getQuantity());
orderItem.setPayment(orderItem.getGoodsPrice() * orderItem.getQuantity());
}
// orderItem.setOrderStatus(orderStatus);
orderItem.setRefundStatus(refundStatus);
orderItem.setRefundCount(0);
orderItem.setUpdateTime(new Date());
orderItem.setUpdateBy("ORDER_MESSAGE");
orderItemMapper.updateById(orderItem);
}
}
// 更新主订单状态（如果全部退款的话，就更新成订单取消状态）
List<OOrderItem> oOrderItems = orderItemMapper.selectList(new LambdaQueryWrapper<OOrderItem>()
.eq(OOrderItem::getOrderId, update.getId())
.eq(OOrderItem::getRefundStatus, 1)
);
// 找出没有退款的子订单，如果没有，那么把主订单直接更新成取消状态
if (oOrderItems == null || oOrderItems.isEmpty()) {
OOrder orderUpdate = new OOrder();
orderUpdate.setId(update.getId());
orderUpdate.setOrderStatus(EnumOOrderStatus.CLOSED.getIndex());
orderUpdate.setCancelReason("子订单全部退款");
orderUpdate.setUpdateBy("子订单全部退款");
orderUpdate.setUpdateTime(new Date());
orderMapper.updateById(orderUpdate);
}
log.info("===========同步pddOrder====成功");
}
return ResultVo.success();
}
}

6
serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/service/impl/PddGoodsServiceImpl.java
View File

@ -9,9 +9,9 @@ import cn.qihangerp.common.utils.StringUtils;
import cn.qihangerp.model.entity.OGoods;
import cn.qihangerp.model.entity.OGoodsInventory;
import cn.qihangerp.model.entity.OGoodsSku;
import cn.qihangerp.module.goods.mapper.OGoodsInventoryMapper;
import cn.qihangerp.module.goods.mapper.OGoodsMapper;
import cn.qihangerp.module.goods.mapper.OGoodsSkuMapper;
import cn.qihangerp.mapper.OGoodsInventoryMapper;
import cn.qihangerp.mapper.OGoodsMapper;
import cn.qihangerp.mapper.OGoodsSkuMapper;
import cn.qihangerp.model.entity.PddGoods;
import cn.qihangerp.model.entity.PddGoodsSku;
import cn.qihangerp.model.bo.PddGoodsBo;

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

@ -194,11 +194,7 @@ public class PddOrderServiceImpl extends ServiceImpl<PddOrderMapper, PddOrder>
// 添加item
for (var item : order.getItems()) {
List<PddGoodsSku> pddGoodsSku = goodsSkuMapper.selectList(new LambdaQueryWrapper<PddGoodsSku>().eq(PddGoodsSku::getSkuId, item.getSkuId()));
if (pddGoodsSku != null && !pddGoodsSku.isEmpty()) {
item.setOGoodsId(pddGoodsSku.get(0).getErpGoodsId().toString());
item.setOGoodsSkuId(pddGoodsSku.get(0).getErpGoodsSkuId().toString());
}
item.setOrderSn(order.getOrderSn());
itemMapper.insert(item);
}
@ -210,11 +206,6 @@ public class PddOrderServiceImpl extends ServiceImpl<PddOrderMapper, PddOrder>
mapper.insert(order);
// 添加item
for (var item : order.getItems()) {
List<PddGoodsSku> pddGoodsSku = goodsSkuMapper.selectList(new LambdaQueryWrapper<PddGoodsSku>().eq(PddGoodsSku::getSkuId, item.getSkuId()));
if (pddGoodsSku != null && !pddGoodsSku.isEmpty()) {
item.setOGoodsId(pddGoodsSku.get(0).getErpGoodsId().toString());
item.setOGoodsSkuId(pddGoodsSku.get(0).getErpGoodsSkuId().toString());
}
item.setOrderSn(order.getOrderSn());
itemMapper.insert(item);
}
@ -262,14 +253,15 @@ public class PddOrderServiceImpl extends ServiceImpl<PddOrderMapper, PddOrder>
order.setShipType(0);
order.setBuyerMemo(pddOrder.getBuyerMemo());
order.setSellerMemo(pddOrder.getRemark());
order.setRefundStatus(1);
order.setOrderStatus(1);
order.setGoodsAmount(pddOrder.getGoodsAmount()!=null?pddOrder.getGoodsAmount():0.0);
order.setPostFee(pddOrder.getPostage()!=null?pddOrder.getPostage():0.0);
order.setSellerDiscount(pddOrder.getSellerDiscount()!=null?pddOrder.getSellerDiscount():0.0);
order.setPlatformDiscount(pddOrder.getPlatformDiscount()!=null?pddOrder.getPlatformDiscount():0.0);
order.setAmount(pddOrder.getPayAmount()!=null?pddOrder.getPayAmount():0.0);
order.setPayment(pddOrder.getPayAmount()!=null?pddOrder.getPayAmount():0.0);
order.setPayDiscount(0.0);
order.setChangeAmount(pddOrder.getOrderChangeAmount());
order.setReceiverName(confirmBo.getReceiver());
order.setReceiverMobile(confirmBo.getMobile());
order.setAddress(confirmBo.getAddress());
@ -278,10 +270,18 @@ public class PddOrderServiceImpl extends ServiceImpl<PddOrderMapper, PddOrder>
order.setTown(confirmBo.getTown());
// 定义日期时间格式
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
// 将字符串转换为LocalDateTime
LocalDateTime orderTime = LocalDateTime.parse(pddOrder.getCreatedTime(), formatter);
order.setOrderCreateTime(StringUtils.hasText(pddOrder.getCreatedTime())?LocalDateTime.parse(pddOrder.getCreatedTime(), formatter):LocalDateTime.now());
order.setOrderUpdateTime(StringUtils.hasText(pddOrder.getUpdatedAt())?LocalDateTime.parse(pddOrder.getUpdatedAt(), formatter):LocalDateTime.now());
order.setOrderFinishTime(StringUtils.hasText(pddOrder.getReceiveTime())?LocalDateTime.parse(pddOrder.getReceiveTime(), formatter):null);
order.setOrderStatus(pddOrder.getOrderStatus().toString());
if(pddOrder.getOrderStatus().intValue() ==1){
order.setOrderStatusText("待发货");
}else if(pddOrder.getOrderStatus().intValue() ==2){
order.setOrderStatusText("已发货待签收");
}else if(pddOrder.getOrderStatus().intValue() ==3){
order.setOrderStatusText("已签收");
}
order.setOrderTime(StringUtils.hasText(pddOrder.getCreatedTime())?orderTime:LocalDateTime.now());
order.setShipper(0L);
order.setShipStatus(0);
order.setCreateTime(new Date());
@ -290,14 +290,22 @@ public class PddOrderServiceImpl extends ServiceImpl<PddOrderMapper, PddOrder>
//插入item
for (var item : pddOrderItems) {
OOrderItem oOrderItem = new OOrderItem();
List<PddGoodsSku> skus = goodsSkuMapper.selectList(new LambdaQueryWrapper<PddGoodsSku>().eq(PddGoodsSku::getSkuId, item.getSkuId()));
if (skus != null && !skus.isEmpty()) {
oOrderItem.setGoodsId(skus.get(0).getErpGoodsId());
oOrderItem.setGoodsSkuId(skus.get(0).getErpGoodsSkuId());
}else {
return ResultVo.error("店铺商品找不到绑定的商品库商品");
}
oOrderItem.setOrderId(order.getId());
oOrderItem.setOrderNum(pddOrder.getOrderSn());
oOrderItem.setSubOrderNum(pddOrder.getOrderSn()+"-"+item.getSkuId());
oOrderItem.setShopType(EnumShopType.PDD.getIndex());
oOrderItem.setShopId(pddOrder.getShopId());
// 商品信息
oOrderItem.setProductId(item.getGoodsId().toString());
oOrderItem.setSkuId(item.getSkuId().toString());
oOrderItem.setGoodsId(StringUtils.hasText(item.getOGoodsId())?Long.parseLong(item.getOGoodsId()):0L);
oOrderItem.setGoodsSkuId(StringUtils.hasText(item.getOGoodsSkuId())?Long.parseLong(item.getOGoodsSkuId()):0L);
oOrderItem.setGoodsTitle(item.getGoodsName());
oOrderItem.setGoodsImg(item.getGoodsImg());
oOrderItem.setGoodsNum(item.getOuterGoodsId());
@ -305,12 +313,23 @@ public class PddOrderServiceImpl extends ServiceImpl<PddOrderMapper, PddOrder>
oOrderItem.setSkuNum(item.getOuterId());
oOrderItem.setGoodsPrice(item.getGoodsPrice()!=null?item.getGoodsPrice():0.0);
oOrderItem.setQuantity(item.getGoodsCount());
oOrderItem.setItemAmount(oOrderItem.getGoodsPrice()*oOrderItem.getQuantity());
oOrderItem.setDiscountAmount(0.0);
oOrderItem.setPayment(0.0);
oOrderItem.setRefundCount(0);
oOrderItem.setRefundStatus(1);
// 价格信息
Double goodsAmount = item.getGoodsPrice() * item.getGoodsCount();
oOrderItem.setGoodsAmount(goodsAmount);
oOrderItem.setItemAmount(pddOrder.getPayAmount());
oOrderItem.setSellerDiscount(pddOrder.getSellerDiscount());
oOrderItem.setPlatformDiscount(pddOrder.getPlatformDiscount());
oOrderItem.setPayDiscount(0.0);
oOrderItem.setChangeAmount(pddOrder.getOrderChangeAmount());
oOrderItem.setPayment(pddOrder.getPayAmount());
if(pddOrder.getRefundStatus().intValue()==1) {
oOrderItem.setRefundCount(0);
oOrderItem.setRefundStatus(1);
}else{
oOrderItem.setRefundStatus(pddOrder.getRefundStatus());
oOrderItem.setRefundCount(item.getGoodsCount());
}
oOrderItem.setShipper(0l);
oOrderItem.setShipType(order.getShipType());
oOrderItem.setShipStatus(0);

2
serviceImpl/pom.xml
View File

@ -17,7 +17,7 @@
<modules>
<module>sys</module>
<module>goods</module>
<module>order</module>
<!-- <module>order</module>-->
<!-- <module>service</module>-->
<module>wei</module>
<module>stock</module>

6
serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/service/impl/TaoGoodsServiceImpl.java
View File

@ -9,9 +9,9 @@ import cn.qihangerp.common.utils.StringUtils;
import cn.qihangerp.model.entity.OGoods;
import cn.qihangerp.model.entity.OGoodsInventory;
import cn.qihangerp.model.entity.OGoodsSku;
import cn.qihangerp.module.goods.mapper.OGoodsInventoryMapper;
import cn.qihangerp.module.goods.mapper.OGoodsMapper;
import cn.qihangerp.module.goods.mapper.OGoodsSkuMapper;
import cn.qihangerp.mapper.OGoodsInventoryMapper;
import cn.qihangerp.mapper.OGoodsMapper;
import cn.qihangerp.mapper.OGoodsSkuMapper;
import cn.qihangerp.model.entity.TaoGoods;
import cn.qihangerp.model.entity.TaoGoodsSku;
import cn.qihangerp.model.bo.TaoGoodsBo;

6
serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/service/impl/WeiGoodsServiceImpl.java
View File

@ -8,9 +8,9 @@ import cn.qihangerp.common.utils.StringUtils;
import cn.qihangerp.model.entity.OGoods;
import cn.qihangerp.model.entity.OGoodsInventory;
import cn.qihangerp.model.entity.OGoodsSku;
import cn.qihangerp.module.goods.mapper.OGoodsInventoryMapper;
import cn.qihangerp.module.goods.mapper.OGoodsMapper;
import cn.qihangerp.module.goods.mapper.OGoodsSkuMapper;
import cn.qihangerp.mapper.OGoodsInventoryMapper;
import cn.qihangerp.mapper.OGoodsMapper;
import cn.qihangerp.mapper.OGoodsSkuMapper;
import cn.qihangerp.model.entity.WeiGoods;
import cn.qihangerp.model.entity.WeiGoodsSku;
import cn.qihangerp.module.open.wei.mapper.WeiGoodsMapper;