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-04 11:48:02 +08:00
parent 5dcd1922cc
commit 30784b5a93
4 changed files with 91 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/open-api/src/main/java/cn/qihangerp/open/config/MybatisPlusConfig.java
View File

@ -9,7 +9,7 @@ import org.springframework.context.annotation.Configuration;
@Configuration @Configuration
//@MapperScan("com.qihang.tao.mapper") //@MapperScan("com.qihang.tao.mapper")
@MapperScan(basePackages ={"cn.qihangerp.module.open.*.mapper","cn.qihangerp.module.*.mapper","cn.qihangerp.module.mapper"}) @MapperScan(basePackages ={"cn.qihangerp.module.open.*.mapper","cn.qihangerp.module.*.mapper","cn.qihangerp.module.mapper","cn.qihangerp.mapper"})
public class MybatisPlusConfig { public class MybatisPlusConfig {
@Bean @Bean
public MybatisPlusInterceptor mybatisPlusInterceptor() { public MybatisPlusInterceptor mybatisPlusInterceptor() {

1
microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/controller/PddOrderController.java
View File

@ -67,6 +67,5 @@ public class PddOrderController extends BaseController {
if(result.getCode()==0) return success(); if(result.getCode()==0) return success();
else return AjaxResult.error(result.getMsg()); else return AjaxResult.error(result.getMsg());
return AjaxResult.error("未实现");
} }
} }

5
serviceImpl/pdd/pom.xml
View File

@ -24,6 +24,11 @@
<version>1.0</version> <version>1.0</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency>
<groupId>cn.qihangerp.mapper</groupId>
<artifactId>mapper</artifactId>
<version>2.0.0</version>
</dependency>
<dependency> <dependency>
<groupId>cn.qihangerp.service</groupId> <groupId>cn.qihangerp.service</groupId>
<artifactId>goods</artifactId> <artifactId>goods</artifactId>

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

@ -5,9 +5,14 @@ import cn.qihangerp.common.PageQuery;
import cn.qihangerp.common.PageResult; import cn.qihangerp.common.PageResult;
import cn.qihangerp.common.ResultVo; import cn.qihangerp.common.ResultVo;
import cn.qihangerp.common.ResultVoEnum; import cn.qihangerp.common.ResultVoEnum;
import cn.qihangerp.common.enums.EnumShopType;
import cn.qihangerp.common.utils.DateUtils;
import cn.qihangerp.mapper.ErpOrderItemMapper;
import cn.qihangerp.mapper.ErpOrderMapper;
import cn.qihangerp.model.entity.DouOrder; import cn.qihangerp.model.entity.DouOrder;
import cn.qihangerp.model.entity.DouOrderItem; import cn.qihangerp.model.entity.DouOrderItem;
import cn.qihangerp.model.entity.OOrder; import cn.qihangerp.model.entity.OOrder;
import cn.qihangerp.model.entity.OOrderItem;
import cn.qihangerp.module.open.pdd.domain.PddGoodsSku; import cn.qihangerp.module.open.pdd.domain.PddGoodsSku;
import cn.qihangerp.module.open.pdd.domain.PddOrder; import cn.qihangerp.module.open.pdd.domain.PddOrder;
import cn.qihangerp.module.open.pdd.domain.PddOrderItem; import cn.qihangerp.module.open.pdd.domain.PddOrderItem;
@ -45,6 +50,9 @@ public class PddOrderServiceImpl extends ServiceImpl<PddOrderMapper, PddOrder>
private final PddOrderMapper mapper; private final PddOrderMapper mapper;
private final PddOrderItemMapper itemMapper; private final PddOrderItemMapper itemMapper;
private final PddGoodsSkuMapper goodsSkuMapper; private final PddGoodsSkuMapper goodsSkuMapper;
private final ErpOrderMapper erpOrderMapper;
private final ErpOrderItemMapper erpOrderItemMapper;
private final String DATE_PATTERN = private final String DATE_PATTERN =
"^(?:(?:(?:\\d{4}-(?:0?[1-9]|1[0-2])-(?:0?[1-9]|1\\d|2[0-8]))|(?:(?:(?:\\d{2}(?:0[48]|[2468][048]|[13579][26])|(?:(?:0[48]|[2468][048]|[13579][26])00))-0?2-29))$)|(?:(?:(?:\\d{4}-(?:0?[13578]|1[02]))-(?:0?[1-9]|[12]\\d|30))$)|(?:(?:(?:\\d{4}-0?[13-9]|1[0-2])-(?:0?[1-9]|[1-2]\\d|30))$)|(?:(?:(?:\\d{2}(?:0[48]|[13579][26]|[2468][048])|(?:(?:0[48]|[13579][26]|[2468][048])00))-0?2-29))$)$"; "^(?:(?:(?:\\d{4}-(?:0?[1-9]|1[0-2])-(?:0?[1-9]|1\\d|2[0-8]))|(?:(?:(?:\\d{2}(?:0[48]|[2468][048]|[13579][26])|(?:(?:0[48]|[2468][048]|[13579][26])00))-0?2-29))$)|(?:(?:(?:\\d{4}-(?:0?[13578]|1[02]))-(?:0?[1-9]|[12]\\d|30))$)|(?:(?:(?:\\d{4}-0?[13-9]|1[0-2])-(?:0?[1-9]|[1-2]\\d|30))$)|(?:(?:(?:\\d{2}(?:0[48]|[13579][26]|[2468][048])|(?:(?:0[48]|[13579][26]|[2468][048])00))-0?2-29))$)$";
private final Pattern DATE_FORMAT = Pattern.compile(DATE_PATTERN); private final Pattern DATE_FORMAT = Pattern.compile(DATE_PATTERN);
@ -235,18 +243,83 @@ public class PddOrderServiceImpl extends ServiceImpl<PddOrderMapper, PddOrder>
return ResultVo.error("找不到订单item"); return ResultVo.error("找不到订单item");
} }
// OOrder erpOrder = oOrderMapper.selectOne(new LambdaQueryWrapper<OOrder>().eq(OOrder::getOrderNum,pddOrder.getOrderId())); OOrder erpOrder = erpOrderMapper.selectOne(new LambdaQueryWrapper<OOrder>().eq(OOrder::getOrderNum,pddOrder.getOrderSn()));
// if(erpOrder!=null) { if(erpOrder!=null) {
// // 已经确认过了，更新自己 // 已经确认过了，更新自己
// PddOrder douOrderUpdate = new PddOrder(); PddOrder douOrderUpdate = new PddOrder();
// douOrderUpdate.setId(pddOrder.getId()); douOrderUpdate.setId(pddOrder.getId());
// douOrderUpdate.setAuditStatus(1); douOrderUpdate.setAuditStatus(1);
// douOrderUpdate.setAuditTime(new Date()); douOrderUpdate.setAuditTime(new Date());
// mapper.updateById(douOrderUpdate); mapper.updateById(douOrderUpdate);
//
// return ResultVo.error("已经确认过了"); return ResultVo.error("已经确认过了");
// } }
return null; OOrder order = new OOrder();
order.setOrderNum(pddOrder.getOrderSn());
order.setShopType(EnumShopType.PDD.getIndex());
order.setShopId(pddOrder.getShopId());
// order.setShipType(confirmBo.getShipType());
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.setReceiverName(confirmBo.getReceiver());
order.setReceiverMobile(confirmBo.getMobile());
order.setAddress(confirmBo.getAddress());
order.setProvince(confirmBo.getProvince());
order.setCity(confirmBo.getCity());
order.setTown(confirmBo.getTown());
order.setOrderTime(StringUtils.hasText(pddOrder.getCreatedTime())?DateUtils.dateTime("yyyy-MM-dd HH:mm:ss",pddOrder.getCreatedTime()):new Date());
order.setShipper(-1);
order.setShipStatus(0);
order.setCreateTime(new Date());
order.setCreateBy("手动确认订单");
erpOrderMapper.insert(order);
//插入item
for (var item : pddOrderItems) {
OOrderItem oOrderItem = new OOrderItem();
oOrderItem.setOrderId(order.getId());
oOrderItem.setOrderNum(pddOrder.getOrderSn());
oOrderItem.setSubOrderNum(pddOrder.getOrderSn()+"-"+item.getSkuId());
oOrderItem.setShopType(EnumShopType.PDD.getIndex());
oOrderItem.setShopId(pddOrder.getShopId());
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());
oOrderItem.setGoodsSpec(item.getGoodsSpec());
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);
oOrderItem.setShipper(-1);
oOrderItem.setShipType(order.getShipType());
oOrderItem.setShipStatus(0);
oOrderItem.setCreateTime(new Date());
oOrderItem.setCreateBy("手动确认订单");
erpOrderItemMapper.insert(oOrderItem);
}
// 更新自己
PddOrder douOrderUpdate = new PddOrder();
douOrderUpdate.setId(pddOrder.getId());
douOrderUpdate.setAuditStatus(1);
douOrderUpdate.setAuditTime(new Date());
mapper.updateById(douOrderUpdate);
return ResultVo.success();
} }
} }