From 335d10d7ed9f662857bd20263edf514de11008a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=AF=E8=88=AA?= <280645618@qq.com> Date: Sat, 4 Oct 2025 10:19:46 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84pdd=E7=A1=AE=E8=AE=A4?= =?UTF-8?q?=E8=AE=A2=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pdd/controller/PddOrderController.java | 6 +- .../open/pdd/service/PddOrderService.java | 3 + .../pdd/service/impl/PddOrderServiceImpl.java | 31 ++++++ vue/src/views/dou/order/index.vue | 10 +- vue/src/views/pdd/order/index.vue | 102 +++++++++--------- 5 files changed, 94 insertions(+), 58 deletions(-) diff --git a/microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/controller/PddOrderController.java b/microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/controller/PddOrderController.java index a07c0497..2d072c87 100644 --- a/microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/controller/PddOrderController.java +++ b/microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/controller/PddOrderController.java @@ -63,9 +63,9 @@ public class PddOrderController extends BaseController { public AjaxResult confirmOrder(@RequestBody PddOrderConfirmBo bo) { log.info("=========确认订单======={}", JSONObject.toJSONString(bo)); -// var result = orderService.confirmOrder(bo); -// if(result.getCode()==0) return success(); -// else return AjaxResult.error(result.getMsg()); + var result = orderService.confirmOrder(bo); + if(result.getCode()==0) return success(); + else return AjaxResult.error(result.getMsg()); return AjaxResult.error("未实现"); } diff --git a/serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/service/PddOrderService.java b/serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/service/PddOrderService.java index adba5edf..64547eaa 100644 --- a/serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/service/PddOrderService.java +++ b/serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/service/PddOrderService.java @@ -5,6 +5,7 @@ import cn.qihangerp.common.PageResult; import cn.qihangerp.common.ResultVo; import cn.qihangerp.module.open.pdd.domain.PddOrder; import cn.qihangerp.module.open.pdd.domain.bo.PddOrderBo; +import cn.qihangerp.module.open.pdd.domain.bo.PddOrderConfirmBo; import com.baomidou.mybatisplus.extension.service.IService; @@ -25,4 +26,6 @@ public interface PddOrderService extends IService { * @return */ ResultVo saveOrder(Long shopId, PddOrder order); + + ResultVo confirmOrder(PddOrderConfirmBo confirmBo); } diff --git a/serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/service/impl/PddOrderServiceImpl.java b/serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/service/impl/PddOrderServiceImpl.java index aec14315..92ca064a 100644 --- a/serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/service/impl/PddOrderServiceImpl.java +++ b/serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/service/impl/PddOrderServiceImpl.java @@ -5,10 +5,14 @@ import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageResult; import cn.qihangerp.common.ResultVo; import cn.qihangerp.common.ResultVoEnum; +import cn.qihangerp.model.entity.DouOrder; +import cn.qihangerp.model.entity.DouOrderItem; +import cn.qihangerp.model.entity.OOrder; import cn.qihangerp.module.open.pdd.domain.PddGoodsSku; import cn.qihangerp.module.open.pdd.domain.PddOrder; import cn.qihangerp.module.open.pdd.domain.PddOrderItem; import cn.qihangerp.module.open.pdd.domain.bo.PddOrderBo; +import cn.qihangerp.module.open.pdd.domain.bo.PddOrderConfirmBo; import cn.qihangerp.module.open.pdd.mapper.PddGoodsSkuMapper; import cn.qihangerp.module.open.pdd.mapper.PddOrderItemMapper; import cn.qihangerp.module.open.pdd.mapper.PddOrderMapper; @@ -218,6 +222,33 @@ public class PddOrderServiceImpl extends ServiceImpl } } + @Override + public ResultVo confirmOrder(PddOrderConfirmBo confirmBo) { + PddOrder pddOrder = mapper.selectById(confirmBo.getOrderId()); + if(pddOrder==null) return ResultVo.error("订单数据不存在"); + if(pddOrder.getAuditStatus()!=0) return ResultVo.error("已经确认过了！"); + + List pddOrderItems = itemMapper.selectList( + new LambdaQueryWrapper() + .eq(PddOrderItem::getOrderSn, pddOrder.getOrderSn())); + if(pddOrderItems==null || pddOrderItems.isEmpty()){ + return ResultVo.error("找不到订单item"); + } + +// OOrder erpOrder = oOrderMapper.selectOne(new LambdaQueryWrapper().eq(OOrder::getOrderNum,pddOrder.getOrderId())); +// if(erpOrder!=null) { +// // 已经确认过了，更新自己 +// PddOrder douOrderUpdate = new PddOrder(); +// douOrderUpdate.setId(pddOrder.getId()); +// douOrderUpdate.setAuditStatus(1); +// douOrderUpdate.setAuditTime(new Date()); +// mapper.updateById(douOrderUpdate); +// +// return ResultVo.error("已经确认过了"); +// } + return null; + } + } diff --git a/vue/src/views/dou/order/index.vue b/vue/src/views/dou/order/index.vue index 20be3666..a8ff7d3b 100644 --- a/vue/src/views/dou/order/index.vue +++ b/vue/src/views/dou/order/index.vue @@ -251,7 +251,7 @@ {{form.promotionTalentAmount}} {{form.postAmount}} {{form.orderAmount}} - {{ form.payAmount }} + {{ form.payAmount }} @@ -274,13 +274,13 @@ - + - - + + diff --git a/vue/src/views/pdd/order/index.vue b/vue/src/views/pdd/order/index.vue index ea5fbfaf..7027dd73 100644 --- a/vue/src/views/pdd/order/index.vue +++ b/vue/src/views/pdd/order/index.vue @@ -203,57 +203,56 @@ {{form.id}} - {{form.orderId}} + {{form.orderSn}} {{ shopList.find(x=>x.id === form.shopId)?shopList.find(x=>x.id === form.shopId).name:'' }} - - {{form.btypeDesc}} + + + 拼团中 + 已成团 + 团失败 + + + 无售后或售后关闭 + 售后处理中 + 退款中 + 退款成功 - {{ form.orderStatusDesc }} + 待发货 + 已发货待签收 + 已签收 - - {{ form.mainStatusDesc }} - - - - - - - - {{form.buyerWords}} + {{form.buyerMemo}} - - {{form.sellerWords}} - - - {{form.cancelReason}} + + {{form.remark}} - {{ parseTime(form.createTime*1000) }} + {{form.createdTime}} - {{ parseTime(form.payTime*1000) }} - {{ parseTime(form.updateTime*1000) }} + {{ form.payTime }} + {{ form.updatedAt }} + {{ form.lastShipTime }} - - - {{form.promotionShopAmount}} - {{form.promotionTalentAmount}} - {{form.postAmount}} - {{form.orderAmount}} - {{ form.payAmount }} + {{form.goodsAmount}} + {{form.capitalFreeDiscount}} + {{form.discountAmount}} + {{form.postage}} + {{form.sellerDiscount}} + {{form.payAmount}} - {{form.maskPostReceiver}} - {{form.maskPostTel}} - {{form.provinceName}}{{form.cityName}}{{form.townName}} - {{form.maskPostAddress}} + {{form.receiverNameMask}} + {{form.receiverPhoneMask}} + {{form.province}}{{form.city}}{{form.town}} + {{form.receiverAddressMask}} @@ -267,27 +266,26 @@ 订单商品 - - + - - - + + + - - + + 收件人 - - + + - - + + - - + + @@ -362,6 +360,10 @@ export default { form: { }, rules: { + receiverNameMask:[{ required: true, message: '不能为空' }], + receiverPhoneMask:[{ required: true, message: '不能为空' }], + provinces: [{ required: true, message: '不能为空' }], + receiverAddressMask: [{ required: true, message: '不能为空' }], } }; }, @@ -530,9 +532,9 @@ export default { getOrder(id).then(response => { this.form = response.data; this.form.provinces = [] - this.form.provinces.push(response.data.provinceName) - this.form.provinces.push(response.data.cityName) - this.form.provinces.push(response.data.townName) + this.form.provinces.push(response.data.province) + this.form.provinces.push(response.data.city) + this.form.provinces.push(response.data.town) this.detailOpen = true; this.detailTitle = "确认订单"; this.isAudit = true