From 3f8864938ac5b670ee9c6d242309d5ade290afc1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=AF=E8=88=AA=E8=80=81=E9=BD=90?= <280645618@qq.com> Date: Wed, 1 Oct 2025 23:22:50 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84dou=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E7=A1=AE=E8=AE=A4=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/qihangerp/model/entity}/OOrder.java | 8 +- .../qihangerp/model/entity}/OOrderItem.java | 2 +- .../cn/qihangerp/model/entity}/ORefund.java | 2 +- .../qihangerp/model}/vo/OrderDiscountVo.java | 2 +- .../qihangerp/model}/vo/OrderItemListVo.java | 2 +- .../open/dou/mapper/DouOOrderItemMapper.java | 22 ++++ .../open/dou/mapper/DouOOrderMapper.java | 20 +++ .../open/dou/service/DouOOrderService.java | 14 +++ .../service/impl/DouOOrderServiceImpl.java | 29 +++++ .../dou/service/impl/DouOrderServiceImpl.java | 114 ++++++++++++++++-- .../mapper/dou/DouOOrderItemMapper.xml | 53 ++++++++ .../resources/mapper/dou/DouOOrderMapper.xml | 58 +++++++++ .../module/order/mapper/OOrderItemMapper.java | 6 +- .../module/order/mapper/OOrderMapper.java | 6 +- .../module/order/mapper/ORefundMapper.java | 4 +- .../order/service/OOrderItemService.java | 4 +- .../module/order/service/OOrderService.java | 4 +- .../module/order/service/ORefundService.java | 2 +- .../service/impl/OOrderItemServiceImpl.java | 4 +- .../order/service/impl/OOrderServiceImpl.java | 7 +- .../service/impl/ORefundServiceImpl.java | 6 +- .../resources/mapper/OOrderItemMapper.xml | 6 +- .../main/resources/mapper/OOrderMapper.xml | 4 +- .../main/resources/mapper/ORefundMapper.xml | 2 +- vue/src/views/dou/order/index.vue | 18 +-- vue/src/views/order/index.vue | 42 ++++--- 26 files changed, 366 insertions(+), 75 deletions(-) rename {serviceImpl/order/src/main/java/cn/qihangerp/module/order/domain => core/model/src/main/java/cn/qihangerp/model/entity}/OOrder.java (93%) rename {serviceImpl/order/src/main/java/cn/qihangerp/module/order/domain => core/model/src/main/java/cn/qihangerp/model/entity}/OOrderItem.java (98%) rename {serviceImpl/order/src/main/java/cn/qihangerp/module/order/domain => core/model/src/main/java/cn/qihangerp/model/entity}/ORefund.java (98%) rename {serviceImpl/order/src/main/java/cn/qihangerp/module/order/domain => core/model/src/main/java/cn/qihangerp/model}/vo/OrderDiscountVo.java (77%) rename {serviceImpl/order/src/main/java/cn/qihangerp/module/order/domain => core/model/src/main/java/cn/qihangerp/model}/vo/OrderItemListVo.java (95%) create mode 100644 serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/mapper/DouOOrderItemMapper.java create mode 100644 serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/mapper/DouOOrderMapper.java create mode 100644 serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/service/DouOOrderService.java create mode 100644 serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/service/impl/DouOOrderServiceImpl.java create mode 100644 serviceImpl/dou/src/main/resources/mapper/dou/DouOOrderItemMapper.xml create mode 100644 serviceImpl/dou/src/main/resources/mapper/dou/DouOOrderMapper.xml diff --git a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/domain/OOrder.java b/core/model/src/main/java/cn/qihangerp/model/entity/OOrder.java similarity index 93% rename from serviceImpl/order/src/main/java/cn/qihangerp/module/order/domain/OOrder.java rename to core/model/src/main/java/cn/qihangerp/model/entity/OOrder.java index c7db4a8c..0164f61b 100644 --- a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/domain/OOrder.java +++ b/core/model/src/main/java/cn/qihangerp/model/entity/OOrder.java @@ -1,7 +1,7 @@ -package cn.qihangerp.module.order.domain; +package cn.qihangerp.model.entity; -import cn.qihangerp.module.order.domain.vo.OrderDiscountVo; -import cn.qihangerp.module.order.domain.vo.OrderItemListVo; +import cn.qihangerp.model.vo.OrderDiscountVo; +import cn.qihangerp.model.vo.OrderItemListVo; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; @@ -141,7 +141,7 @@ public class OOrder implements Serializable { private Integer shipper; /** - * 发货方式1电子面单发货2手动发货 + * 发货方式1供应商代发0仓库发货 */ private Integer shipType; diff --git a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/domain/OOrderItem.java b/core/model/src/main/java/cn/qihangerp/model/entity/OOrderItem.java similarity index 98% rename from serviceImpl/order/src/main/java/cn/qihangerp/module/order/domain/OOrderItem.java rename to core/model/src/main/java/cn/qihangerp/model/entity/OOrderItem.java index 583da769..32e39321 100644 --- a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/domain/OOrderItem.java +++ b/core/model/src/main/java/cn/qihangerp/model/entity/OOrderItem.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.order.domain; +package cn.qihangerp.model.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/domain/ORefund.java b/core/model/src/main/java/cn/qihangerp/model/entity/ORefund.java similarity index 98% rename from serviceImpl/order/src/main/java/cn/qihangerp/module/order/domain/ORefund.java rename to core/model/src/main/java/cn/qihangerp/model/entity/ORefund.java index edfa4980..c0dfb818 100644 --- a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/domain/ORefund.java +++ b/core/model/src/main/java/cn/qihangerp/model/entity/ORefund.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.order.domain; +package cn.qihangerp.model.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/domain/vo/OrderDiscountVo.java b/core/model/src/main/java/cn/qihangerp/model/vo/OrderDiscountVo.java similarity index 77% rename from serviceImpl/order/src/main/java/cn/qihangerp/module/order/domain/vo/OrderDiscountVo.java rename to core/model/src/main/java/cn/qihangerp/model/vo/OrderDiscountVo.java index a9657016..122fc3b4 100644 --- a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/domain/vo/OrderDiscountVo.java +++ b/core/model/src/main/java/cn/qihangerp/model/vo/OrderDiscountVo.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.order.domain.vo; +package cn.qihangerp.model.vo; import lombok.Data; diff --git a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/domain/vo/OrderItemListVo.java b/core/model/src/main/java/cn/qihangerp/model/vo/OrderItemListVo.java similarity index 95% rename from serviceImpl/order/src/main/java/cn/qihangerp/module/order/domain/vo/OrderItemListVo.java rename to core/model/src/main/java/cn/qihangerp/model/vo/OrderItemListVo.java index e0903294..7d167442 100644 --- a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/domain/vo/OrderItemListVo.java +++ b/core/model/src/main/java/cn/qihangerp/model/vo/OrderItemListVo.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.order.domain.vo; +package cn.qihangerp.model.vo; import lombok.Data; diff --git a/serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/mapper/DouOOrderItemMapper.java b/serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/mapper/DouOOrderItemMapper.java new file mode 100644 index 00000000..7383bd9c --- /dev/null +++ b/serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/mapper/DouOOrderItemMapper.java @@ -0,0 +1,22 @@ +package cn.qihangerp.module.open.dou.mapper; + +import cn.qihangerp.model.entity.OOrderItem; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** +* @author qilip +* @description 针对表【o_order_item(OMS订单明细表)】的数据库操作Mapper +* @createDate 2025-06-02 11:23:55 +* @Entity cn.qihangerp.model.entity.OOrderItem +*/ +public interface DouOOrderItemMapper extends BaseMapper { + +} + + + + diff --git a/serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/mapper/DouOOrderMapper.java b/serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/mapper/DouOOrderMapper.java new file mode 100644 index 00000000..16477a6c --- /dev/null +++ b/serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/mapper/DouOOrderMapper.java @@ -0,0 +1,20 @@ +package cn.qihangerp.module.open.dou.mapper; + +import cn.qihangerp.model.entity.OOrder; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +import java.util.List; + +/** +* @author qilip +* @description 针对表【o_order(OMS订单表)】的数据库操作Mapper +* @createDate 2025-06-02 11:23:22 +* @Entity cn.qihangerp.model.entity.OOrder +*/ +public interface DouOOrderMapper extends BaseMapper { + +} + + + + diff --git a/serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/service/DouOOrderService.java b/serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/service/DouOOrderService.java new file mode 100644 index 00000000..19ad571b --- /dev/null +++ b/serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/service/DouOOrderService.java @@ -0,0 +1,14 @@ +package cn.qihangerp.module.open.dou.service; + +import cn.qihangerp.model.entity.OOrder; +import com.baomidou.mybatisplus.extension.service.IService; +import java.util.List; + +/** +* @author qilip +* @description 针对表【o_order(订单表)】的数据库操作Service +* @createDate 2024-03-09 13:15:57 +*/ +public interface DouOOrderService extends IService { + +} diff --git a/serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/service/impl/DouOOrderServiceImpl.java b/serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/service/impl/DouOOrderServiceImpl.java new file mode 100644 index 00000000..ca8ac52d --- /dev/null +++ b/serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/service/impl/DouOOrderServiceImpl.java @@ -0,0 +1,29 @@ +package cn.qihangerp.module.open.dou.service.impl; + +import cn.qihangerp.model.entity.OOrder; +import cn.qihangerp.module.open.dou.mapper.DouOOrderMapper; +import cn.qihangerp.module.open.dou.service.DouOOrderService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.transaction.interceptor.TransactionAspectSupport; +import java.util.*; + +/** +* @author qilip +* @description 针对表【o_order(订单表)】的数据库操作Service实现 +* @createDate 2024-03-09 13:15:57 +*/ +@Slf4j +@AllArgsConstructor +@Service +public class DouOOrderServiceImpl extends ServiceImpl + implements DouOOrderService { + +} + + + + diff --git a/serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/service/impl/DouOrderServiceImpl.java b/serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/service/impl/DouOrderServiceImpl.java index 0edd13ad..af12de23 100644 --- a/serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/service/impl/DouOrderServiceImpl.java +++ b/serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/service/impl/DouOrderServiceImpl.java @@ -1,30 +1,26 @@ package cn.qihangerp.module.open.dou.service.impl; - import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageResult; import cn.qihangerp.common.ResultVo; import cn.qihangerp.common.ResultVoEnum; +import cn.qihangerp.common.enums.EnumShopType; import cn.qihangerp.common.utils.DateUtils; -import cn.qihangerp.model.entity.DouGoodsSku; -import cn.qihangerp.model.entity.DouOrder; -import cn.qihangerp.model.entity.DouOrderItem; +import cn.qihangerp.model.entity.*; import cn.qihangerp.model.bo.DouOrderBo; import cn.qihangerp.module.open.dou.bo.DouOrderConfirmBo; -import cn.qihangerp.module.open.dou.mapper.DouGoodsSkuMapper; -import cn.qihangerp.module.open.dou.mapper.DouOrderItemMapper; -import cn.qihangerp.module.open.dou.mapper.DouOrderMapper; +import cn.qihangerp.module.open.dou.mapper.*; import cn.qihangerp.module.open.dou.service.DouOrderService; 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 lombok.AllArgsConstructor; import lombok.extern.java.Log; +import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.interceptor.TransactionAspectSupport; import org.springframework.util.StringUtils; - import java.util.Date; import java.util.List; import java.util.regex.Matcher; @@ -35,7 +31,7 @@ import java.util.regex.Pattern; * @description 针对表【dou_order(抖店订单表)】的数据库操作Service实现 * @createDate 2024-06-05 15:06:31 */ -@Log +@Slf4j @AllArgsConstructor @Service public class DouOrderServiceImpl extends ServiceImpl @@ -43,6 +39,10 @@ public class DouOrderServiceImpl extends ServiceImpl private final DouOrderMapper mapper; private final DouOrderItemMapper itemMapper; private final DouGoodsSkuMapper goodsSkuMapper; + private final DouOOrderMapper oOrderMapper; + private final DouOOrderItemMapper oOrderItemMapper; + + 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))$)$"; private final Pattern DATE_FORMAT = Pattern.compile(DATE_PATTERN); @@ -68,7 +68,7 @@ public class DouOrderServiceImpl extends ServiceImpl } LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper() - .eq(bo.getShopId()!=null,DouOrder::getShopId,bo.getShopId()) + .eq(bo.getShopId()!=null,DouOrder::getSShopId,bo.getShopId()) .eq(StringUtils.hasText(bo.getOrderId()),DouOrder::getOrderId,bo.getOrderId()) .eq(StringUtils.hasText(bo.getOrderStatus()),DouOrder::getOrderStatus,bo.getOrderStatus()) .ge(StringUtils.hasText(bo.getStartTime()),DouOrder::getCreateTime, startTimeStamp) @@ -113,7 +113,10 @@ public class DouOrderServiceImpl extends ServiceImpl if (taoOrders != null && taoOrders.size() > 0) { // 存在，修改 DouOrder update = new DouOrder(); + update.setId(taoOrders.get(0).getId()); + update.setSShopId(shopId); + update.setShopId(order.getShopId()); update.setOrderStatus(order.getOrderStatus()); update.setOrderStatusDesc(order.getOrderStatusDesc()); update.setBuyerWords(order.getBuyerWords()); @@ -154,7 +157,7 @@ public class DouOrderServiceImpl extends ServiceImpl return ResultVo.error(ResultVoEnum.DataExist, "订单已经存在，更新成功"); } else { // 不存在，新增 - order.setShopId(shopId); + order.setSShopId(shopId); order.setAuditStatus(0); order.setPullTime(new Date()); mapper.insert(order); @@ -178,9 +181,94 @@ public class DouOrderServiceImpl extends ServiceImpl } } + @Transactional(rollbackFor = Exception.class) @Override - public ResultVo confirmOrder(DouOrderConfirmBo taoOrder) { - return ResultVo.error("未实现"); + public ResultVo confirmOrder(DouOrderConfirmBo confirmBo) { + DouOrder douOrder = mapper.selectById(confirmBo.getOrderId()); + if(douOrder==null) return ResultVo.error("订单数据不存在"); + if(douOrder.getAuditStatus()!=0) return ResultVo.error("已经确认过了！"); + + List douOrderItems = itemMapper.selectList(new LambdaQueryWrapper().eq(DouOrderItem::getParentOrderId, douOrder.getOrderId())); + if(douOrderItems==null || douOrderItems.isEmpty()){ + return ResultVo.error("找不到订单item"); + } + + OOrder erpOrder = oOrderMapper.selectOne(new LambdaQueryWrapper().eq(OOrder::getOrderNum,douOrder.getOrderId())); + if(erpOrder!=null) { + // 已经确认过了，更新自己 + DouOrder douOrderUpdate = new DouOrder(); + douOrderUpdate.setId(douOrder.getId()); + douOrderUpdate.setAuditStatus(1); + douOrderUpdate.setAuditTime(new Date()); + mapper.updateById(douOrderUpdate); + + return ResultVo.error("已经确认过了"); + } + + OOrder order = new OOrder(); + order.setOrderNum(douOrder.getOrderId()); + order.setShopType(EnumShopType.DOU.getIndex()); + order.setShopId(douOrder.getSShopId()); + order.setShipType(confirmBo.getShipType()); + order.setBuyerMemo(douOrder.getBuyerWords()); + order.setSellerMemo(douOrder.getSellerWords()); + order.setRefundStatus(1); + order.setOrderStatus(1); + order.setGoodsAmount(douOrder.getOrderAmount()!=null?douOrder.getOrderAmount().doubleValue()/100:0.0); + order.setPostFee(douOrder.getPostAmount()!=null?douOrder.getPostAmount().doubleValue()/100:0.0); + order.setSellerDiscount(douOrder.getPromotionShopAmount()!=null?douOrder.getPromotionShopAmount().doubleValue()/100:0.0); + order.setPlatformDiscount(douOrder.getPromotionPlatformAmount()!=null?douOrder.getPromotionPlatformAmount().doubleValue()/100:0.0); + order.setAmount(douOrder.getOrderAmount()!=null?douOrder.getOrderAmount().doubleValue()/100:0.0); + order.setPayment(douOrder.getPayAmount()!=null?douOrder.getPayAmount().doubleValue()/100: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(douOrder.getCreateTime()!=null?new Date(douOrder.getCreateTime()*1000):new Date()); + order.setShipper(-1); + order.setShipStatus(0); + order.setCreateTime(new Date()); + order.setCreateBy("手动确认订单"); + oOrderMapper.insert(order); + //插入item + for (var item : douOrderItems) { + OOrderItem oOrderItem = new OOrderItem(); + oOrderItem.setOrderId(order.getId()); + oOrderItem.setOrderNum(douOrder.getOrderId()); + oOrderItem.setSubOrderNum(item.getOrderId()); + oOrderItem.setShopType(EnumShopType.DOU.getIndex()); + oOrderItem.setShopId(douOrder.getSShopId()); + 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.getProductName()); + oOrderItem.setGoodsImg(item.getProductPic()); + oOrderItem.setGoodsNum(item.getOutProductId()); + oOrderItem.setGoodsSpec(item.getSpec()); + oOrderItem.setSkuNum(item.getOutSkuId()); + oOrderItem.setGoodsPrice(item.getGoodsPrice()!=null?item.getGoodsPrice().doubleValue()/100:0.0); + oOrderItem.setItemAmount(item.getOrderAmount()!=null?item.getOrderAmount().doubleValue()/100:0.0); + oOrderItem.setDiscountAmount(item.getPromotionAmount()!=null?item.getPromotionAmount().doubleValue()/100:0.0); + oOrderItem.setPayment(item.getPayAmount()!=null?item.getPayAmount().doubleValue()/100:0.0); + oOrderItem.setQuantity(item.getItemNum()); + oOrderItem.setRefundCount(0); + oOrderItem.setRefundStatus(1); + oOrderItem.setShipper(-1); + oOrderItem.setShipType(order.getShipType()); + oOrderItem.setShipStatus(0); + oOrderItem.setCreateTime(new Date()); + oOrderItem.setCreateBy("手动确认订单"); + oOrderItemMapper.insert(oOrderItem); + } + // 已经确认过了，更新自己 + DouOrder douOrderUpdate = new DouOrder(); + douOrderUpdate.setId(douOrder.getId()); + douOrderUpdate.setAuditStatus(1); + douOrderUpdate.setAuditTime(new Date()); + mapper.updateById(douOrderUpdate); + return ResultVo.success(); } } diff --git a/serviceImpl/dou/src/main/resources/mapper/dou/DouOOrderItemMapper.xml b/serviceImpl/dou/src/main/resources/mapper/dou/DouOOrderItemMapper.xml new file mode 100644 index 00000000..f2c08363 --- /dev/null +++ b/serviceImpl/dou/src/main/resources/mapper/dou/DouOOrderItemMapper.xml @@ -0,0 +1,53 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id,shop_id,shop_type, + order_id,order_num,sub_order_num, + sku_id,goods_id,goods_sku_id, + goods_title,goods_img,goods_num, + goods_spec,sku_num,goods_price, + item_amount,discount_amount,payment, + quantity,remark,refund_count, + refund_status,order_status,shipper, + ship_type,ship_status,create_time, + create_by,update_time,update_by + + + diff --git a/serviceImpl/dou/src/main/resources/mapper/dou/DouOOrderMapper.xml b/serviceImpl/dou/src/main/resources/mapper/dou/DouOOrderMapper.xml new file mode 100644 index 00000000..a337aa50 --- /dev/null +++ b/serviceImpl/dou/src/main/resources/mapper/dou/DouOOrderMapper.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id,order_num,shop_type, + shop_id,remark,buyer_memo, + seller_memo,tag,refund_status, + order_status,goods_amount,post_fee, + seller_discount,platform_discount,amount, + payment,receiver_name,receiver_mobile, + address,province,city, + town,order_time,shipper, + ship_type,ship_status,ship_company, + ship_code,ship_time,create_time, + create_by,update_time,update_by + + + + diff --git a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/mapper/OOrderItemMapper.java b/serviceImpl/order/src/main/java/cn/qihangerp/module/order/mapper/OOrderItemMapper.java index 45d4bc5c..9a341b85 100644 --- a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/mapper/OOrderItemMapper.java +++ b/serviceImpl/order/src/main/java/cn/qihangerp/module/order/mapper/OOrderItemMapper.java @@ -1,8 +1,8 @@ package cn.qihangerp.module.order.mapper; -import cn.qihangerp.module.order.domain.OOrderItem; +import cn.qihangerp.model.entity.OOrderItem; import cn.qihangerp.module.order.domain.bo.OrderItemListBo; -import cn.qihangerp.module.order.domain.vo.OrderItemListVo; +import cn.qihangerp.model.vo.OrderItemListVo; import cn.qihangerp.module.order.domain.vo.SalesTopSkuVo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -14,7 +14,7 @@ import java.util.List; * @author qilip * @description 针对表【o_order_item(OMS订单明细表)】的数据库操作Mapper * @createDate 2025-06-02 11:23:55 -* @Entity cn.qihangerp.module.order.domain.OOrderItem +* @Entity cn.qihangerp.model.entity.OOrderItem */ public interface OOrderItemMapper extends BaseMapper { Page selectPageVo(@Param("page") Page page, @Param("qw") OrderItemListBo qw); diff --git a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/mapper/OOrderMapper.java b/serviceImpl/order/src/main/java/cn/qihangerp/module/order/mapper/OOrderMapper.java index 627e4fe2..fb94a2bd 100644 --- a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/mapper/OOrderMapper.java +++ b/serviceImpl/order/src/main/java/cn/qihangerp/module/order/mapper/OOrderMapper.java @@ -1,7 +1,7 @@ package cn.qihangerp.module.order.mapper; -import cn.qihangerp.module.order.domain.OOrder; -import cn.qihangerp.module.order.domain.vo.OrderDiscountVo; +import cn.qihangerp.model.entity.OOrder; +import cn.qihangerp.model.vo.OrderDiscountVo; import cn.qihangerp.module.order.domain.vo.SalesDailyVo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @@ -11,7 +11,7 @@ import java.util.List; * @author qilip * @description 针对表【o_order(OMS订单表)】的数据库操作Mapper * @createDate 2025-06-02 11:23:22 -* @Entity cn.qihangerp.module.order.domain.OOrder +* @Entity cn.qihangerp.model.entity.OOrder */ public interface OOrderMapper extends BaseMapper { List getTaoOrderDiscount(String tid); diff --git a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/mapper/ORefundMapper.java b/serviceImpl/order/src/main/java/cn/qihangerp/module/order/mapper/ORefundMapper.java index a520de65..a988052d 100644 --- a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/mapper/ORefundMapper.java +++ b/serviceImpl/order/src/main/java/cn/qihangerp/module/order/mapper/ORefundMapper.java @@ -1,14 +1,14 @@ package cn.qihangerp.module.order.mapper; -import cn.qihangerp.module.order.domain.ORefund; +import cn.qihangerp.model.entity.ORefund; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * @author TW * @description 针对表【o_refund(退换货表)】的数据库操作Mapper * @createDate 2024-03-11 14:24:49 -* @Entity cn.qihangerp.module.order.domain.ORefund +* @Entity cn.qihangerp.model.entity.ORefund */ public interface ORefundMapper extends BaseMapper { diff --git a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/OOrderItemService.java b/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/OOrderItemService.java index e8b937d6..67aa6004 100644 --- a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/OOrderItemService.java +++ b/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/OOrderItemService.java @@ -5,9 +5,9 @@ import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageResult; import cn.qihangerp.common.ResultVo; -import cn.qihangerp.module.order.domain.OOrderItem; +import cn.qihangerp.model.entity.OOrderItem; import cn.qihangerp.module.order.domain.bo.OrderItemListBo; -import cn.qihangerp.module.order.domain.vo.OrderItemListVo; +import cn.qihangerp.model.vo.OrderItemListVo; import cn.qihangerp.module.order.domain.vo.SalesTopSkuVo; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/OOrderService.java b/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/OOrderService.java index 19a0a97a..fa8ae416 100644 --- a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/OOrderService.java +++ b/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/OOrderService.java @@ -1,8 +1,8 @@ package cn.qihangerp.module.order.service; import cn.qihangerp.model.request.OrderSearchRequest; -import cn.qihangerp.module.order.domain.OOrder; -import cn.qihangerp.module.order.domain.OOrderItem; +import cn.qihangerp.model.entity.OOrder; +import cn.qihangerp.model.entity.OOrderItem; import cn.qihangerp.module.order.domain.bo.OrderAllocateShipRequest; import cn.qihangerp.module.order.domain.bo.OrderShipRequest; import cn.qihangerp.module.order.domain.vo.SalesDailyVo; diff --git a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/ORefundService.java b/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/ORefundService.java index 3838dc88..21e65077 100644 --- a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/ORefundService.java +++ b/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/ORefundService.java @@ -1,7 +1,7 @@ package cn.qihangerp.module.order.service; -import cn.qihangerp.module.order.domain.ORefund; +import cn.qihangerp.model.entity.ORefund; import cn.qihangerp.module.order.domain.bo.RefundProcessingBo; import cn.qihangerp.module.order.domain.bo.RefundSearchBo; import com.alibaba.fastjson2.JSONObject; diff --git a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/OOrderItemServiceImpl.java b/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/OOrderItemServiceImpl.java index 56ed10a3..89ab6c1e 100644 --- a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/OOrderItemServiceImpl.java +++ b/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/OOrderItemServiceImpl.java @@ -1,9 +1,9 @@ package cn.qihangerp.module.order.service.impl; -import cn.qihangerp.module.order.domain.OOrderItem; +import cn.qihangerp.model.entity.OOrderItem; import cn.qihangerp.module.order.domain.bo.OrderItemListBo; -import cn.qihangerp.module.order.domain.vo.OrderItemListVo; +import cn.qihangerp.model.vo.OrderItemListVo; import cn.qihangerp.module.order.domain.vo.SalesTopSkuVo; import cn.qihangerp.module.order.mapper.OOrderItemMapper; import cn.qihangerp.module.order.service.OOrderItemService; diff --git a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/OOrderServiceImpl.java b/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/OOrderServiceImpl.java index 4094fb33..7c15fd9e 100644 --- a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/OOrderServiceImpl.java +++ b/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/OOrderServiceImpl.java @@ -1,10 +1,7 @@ package cn.qihangerp.module.order.service.impl; -import cn.qihangerp.model.entity.OLogisticsCompany; +import cn.qihangerp.model.entity.*; import cn.qihangerp.model.request.OrderSearchRequest; -import cn.qihangerp.model.entity.OGoods; -import cn.qihangerp.model.entity.OGoodsSku; -import cn.qihangerp.model.entity.OGoodsSupplier; import cn.qihangerp.module.goods.mapper.OGoodsMapper; import cn.qihangerp.module.goods.mapper.OGoodsSkuMapper; import cn.qihangerp.module.goods.mapper.OGoodsSupplierMapper; @@ -12,7 +9,7 @@ import cn.qihangerp.module.mapper.OLogisticsCompanyMapper; import cn.qihangerp.module.order.domain.*; import cn.qihangerp.module.order.domain.bo.OrderAllocateShipRequest; import cn.qihangerp.module.order.domain.bo.OrderShipRequest; -import cn.qihangerp.module.order.domain.vo.OrderDiscountVo; +import cn.qihangerp.model.vo.OrderDiscountVo; import cn.qihangerp.module.order.domain.vo.SalesDailyVo; import cn.qihangerp.module.order.mapper.*; import cn.qihangerp.module.order.service.OOrderService; diff --git a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/ORefundServiceImpl.java b/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/ORefundServiceImpl.java index 278069d7..44602ba9 100644 --- a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/ORefundServiceImpl.java +++ b/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/ORefundServiceImpl.java @@ -10,9 +10,9 @@ import cn.qihangerp.common.ResultVo; import cn.qihangerp.model.entity.OGoodsSku; import cn.qihangerp.module.goods.mapper.OGoodsSkuMapper; import cn.qihangerp.module.order.domain.OAfterSale; -import cn.qihangerp.module.order.domain.OOrder; -import cn.qihangerp.module.order.domain.OOrderItem; -import cn.qihangerp.module.order.domain.ORefund; +import cn.qihangerp.model.entity.OOrder; +import cn.qihangerp.model.entity.OOrderItem; +import cn.qihangerp.model.entity.ORefund; import cn.qihangerp.module.order.domain.bo.RefundProcessingBo; import cn.qihangerp.module.order.domain.bo.RefundSearchBo; import cn.qihangerp.module.order.mapper.OAfterSaleMapper; diff --git a/serviceImpl/order/src/main/resources/mapper/OOrderItemMapper.xml b/serviceImpl/order/src/main/resources/mapper/OOrderItemMapper.xml index 8b6c01bb..dc5b84fb 100644 --- a/serviceImpl/order/src/main/resources/mapper/OOrderItemMapper.xml +++ b/serviceImpl/order/src/main/resources/mapper/OOrderItemMapper.xml @@ -4,7 +4,7 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -50,7 +50,7 @@ create_by,update_time,update_by - SELECT oi.*,o.shop_id,o.order_time,gs.outer_erp_sku_id FROM o_order_item as oi @@ -84,7 +84,7 @@ - SELECT oi.*,o.shop_id,o.order_time,gs.outer_erp_sku_id FROM o_order_item as oi diff --git a/serviceImpl/order/src/main/resources/mapper/OOrderMapper.xml b/serviceImpl/order/src/main/resources/mapper/OOrderMapper.xml index 34d89de8..3a6b55d8 100644 --- a/serviceImpl/order/src/main/resources/mapper/OOrderMapper.xml +++ b/serviceImpl/order/src/main/resources/mapper/OOrderMapper.xml @@ -4,7 +4,7 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -54,7 +54,7 @@ create_by,update_time,update_by - + diff --git a/serviceImpl/order/src/main/resources/mapper/ORefundMapper.xml b/serviceImpl/order/src/main/resources/mapper/ORefundMapper.xml index a4dc5bb4..6b8fa4ff 100644 --- a/serviceImpl/order/src/main/resources/mapper/ORefundMapper.xml +++ b/serviceImpl/order/src/main/resources/mapper/ORefundMapper.xml @@ -4,7 +4,7 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + diff --git a/vue/src/views/dou/order/index.vue b/vue/src/views/dou/order/index.vue index 9b4f3f95..3aa5a0b0 100644 --- a/vue/src/views/dou/order/index.vue +++ b/vue/src/views/dou/order/index.vue @@ -177,8 +177,7 @@
- 确认发货 + 确认发货 取 消
@@ -546,10 +545,15 @@ export default { } confirmOrder(form).then(response => { - this.$modal.msgSuccess("订单确认成功"); - this.detailOpen = false; - this.isAudit = false - this.getList(); + if(response.code===200){ + this.$modal.msgSuccess("订单确认成功"); + this.detailOpen = false; + this.isAudit = false + this.getList(); + }else{ + this.$modal.msgError(response.msg); + } + }); } diff --git a/vue/src/views/order/index.vue b/vue/src/views/order/index.vue index f5e03a7f..c8e90833 100644 --- a/vue/src/views/order/index.vue +++ b/vue/src/views/order/index.vue @@ -255,24 +255,30 @@ {{ parseTime(scope.row.orderTime) }} - - - - - - - - - - - - - - - - - - + + +