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

完善dou订单确认功能

This commit is contained in:
启航老齐 2025-10-01 23:22:50 +08:00
parent 41b46753c9
commit 3f8864938a
26 changed files with 366 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
serviceImpl/order/src/main/java/cn/qihangerp/module/order/domain/OOrder.java → core/model/src/main/java/cn/qihangerp/model/entity/OOrder.java
View File

@ -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;

2
serviceImpl/order/src/main/java/cn/qihangerp/module/order/domain/OOrderItem.java → core/model/src/main/java/cn/qihangerp/model/entity/OOrderItem.java
View File

@ -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;

2
serviceImpl/order/src/main/java/cn/qihangerp/module/order/domain/ORefund.java → core/model/src/main/java/cn/qihangerp/model/entity/ORefund.java
View File

@ -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;

2
serviceImpl/order/src/main/java/cn/qihangerp/module/order/domain/vo/OrderDiscountVo.java → core/model/src/main/java/cn/qihangerp/model/vo/OrderDiscountVo.java
View File

@ -1,4 +1,4 @@
package cn.qihangerp.module.order.domain.vo;
package cn.qihangerp.model.vo;
import lombok.Data;

2
serviceImpl/order/src/main/java/cn/qihangerp/module/order/domain/vo/OrderItemListVo.java → core/model/src/main/java/cn/qihangerp/model/vo/OrderItemListVo.java
View File

@ -1,4 +1,4 @@
package cn.qihangerp.module.order.domain.vo;
package cn.qihangerp.model.vo;
import lombok.Data;

22
serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/mapper/DouOOrderItemMapper.java Normal file
View File

@ -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<OOrderItem> {
}

20
serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/mapper/DouOOrderMapper.java Normal file
View File

@ -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<OOrder> {
}

14
serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/service/DouOOrderService.java Normal file
View File

@ -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<OOrder> {
}

29
serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/service/impl/DouOOrderServiceImpl.java Normal file
View File

@ -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<DouOOrderMapper, OOrder>
implements DouOOrderService {
}

114
serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/service/impl/DouOrderServiceImpl.java
View File

@ -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<DouOrderMapper, DouOrder>
@ -43,6 +39,10 @@ public class DouOrderServiceImpl extends ServiceImpl<DouOrderMapper, DouOrder>
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<DouOrderMapper, DouOrder>
}
LambdaQueryWrapper<DouOrder> queryWrapper = new LambdaQueryWrapper<DouOrder>()
.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<DouOrderMapper, DouOrder>
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<DouOrderMapper, DouOrder>
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<DouOrderMapper, DouOrder>
}
}
@Transactional(rollbackFor = Exception.class)
@Override
public ResultVo<Long> confirmOrder(DouOrderConfirmBo taoOrder) {
return ResultVo.error("未实现");
public ResultVo<Long> confirmOrder(DouOrderConfirmBo confirmBo) {
DouOrder douOrder = mapper.selectById(confirmBo.getOrderId());
if(douOrder==null) return ResultVo.error("订单数据不存在");
if(douOrder.getAuditStatus()!=0) return ResultVo.error("已经确认过了！");
List<DouOrderItem> douOrderItems = itemMapper.selectList(new LambdaQueryWrapper<DouOrderItem>().eq(DouOrderItem::getParentOrderId, douOrder.getOrderId()));
if(douOrderItems==null || douOrderItems.isEmpty()){
return ResultVo.error("找不到订单item");
}
OOrder erpOrder = oOrderMapper.selectOne(new LambdaQueryWrapper<OOrder>().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();
}
}

53
serviceImpl/dou/src/main/resources/mapper/dou/DouOOrderItemMapper.xml Normal file
View File

@ -0,0 +1,53 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cn.qihangerp.module.open.dou.mapper.DouOOrderItemMapper">
<resultMap id="BaseResultMap" type="cn.qihangerp.model.entity.OOrderItem">
<id property="id" column="id" jdbcType="BIGINT"/>
<result property="shopId" column="shop_id" jdbcType="BIGINT"/>
<result property="shopType" column="shop_type" jdbcType="INTEGER"/>
<result property="orderId" column="order_id" jdbcType="BIGINT"/>
<result property="orderNum" column="order_num" jdbcType="VARCHAR"/>
<result property="subOrderNum" column="sub_order_num" jdbcType="VARCHAR"/>
<result property="skuId" column="sku_id" jdbcType="VARCHAR"/>
<result property="goodsId" column="goods_id" jdbcType="BIGINT"/>
<result property="goodsSkuId" column="goods_sku_id" jdbcType="BIGINT"/>
<result property="goodsTitle" column="goods_title" jdbcType="VARCHAR"/>
<result property="goodsImg" column="goods_img" jdbcType="VARCHAR"/>
<result property="goodsNum" column="goods_num" jdbcType="VARCHAR"/>
<result property="goodsSpec" column="goods_spec" jdbcType="VARCHAR"/>
<result property="skuNum" column="sku_num" jdbcType="VARCHAR"/>
<result property="goodsPrice" column="goods_price" jdbcType="DOUBLE"/>
<result property="itemAmount" column="item_amount" jdbcType="DOUBLE"/>
<result property="discountAmount" column="discount_amount" jdbcType="DOUBLE"/>
<result property="payment" column="payment" jdbcType="DOUBLE"/>
<result property="quantity" column="quantity" jdbcType="INTEGER"/>
<result property="remark" column="remark" jdbcType="VARCHAR"/>
<result property="refundCount" column="refund_count" jdbcType="INTEGER"/>
<result property="refundStatus" column="refund_status" jdbcType="INTEGER"/>
<result property="orderStatus" column="order_status" jdbcType="INTEGER"/>
<result property="shipper" column="shipper" jdbcType="INTEGER"/>
<result property="shipType" column="ship_type" jdbcType="INTEGER"/>
<result property="shipStatus" column="ship_status" jdbcType="INTEGER"/>
<result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
<result property="createBy" column="create_by" jdbcType="VARCHAR"/>
<result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
<result property="updateBy" column="update_by" jdbcType="VARCHAR"/>
</resultMap>
<sql id="Base_Column_List">
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
</sql>
</mapper>

58
serviceImpl/dou/src/main/resources/mapper/dou/DouOOrderMapper.xml Normal file
View File

@ -0,0 +1,58 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cn.qihangerp.module.open.dou.mapper.DouOOrderMapper">
<resultMap id="BaseResultMap" type="cn.qihangerp.model.entity.OOrder">
<id property="id" column="id" jdbcType="BIGINT"/>
<result property="orderNum" column="order_num" jdbcType="VARCHAR"/>
<result property="shopType" column="shop_type" jdbcType="INTEGER"/>
<result property="shopId" column="shop_id" jdbcType="BIGINT"/>
<result property="remark" column="remark" jdbcType="VARCHAR"/>
<result property="buyerMemo" column="buyer_memo" jdbcType="VARCHAR"/>
<result property="sellerMemo" column="seller_memo" jdbcType="VARCHAR"/>
<result property="tag" column="tag" jdbcType="VARCHAR"/>
<result property="refundStatus" column="refund_status" jdbcType="INTEGER"/>
<result property="orderStatus" column="order_status" jdbcType="INTEGER"/>
<result property="goodsAmount" column="goods_amount" jdbcType="DOUBLE"/>
<result property="postFee" column="post_fee" jdbcType="DOUBLE"/>
<result property="sellerDiscount" column="seller_discount" jdbcType="DOUBLE"/>
<result property="platformDiscount" column="platform_discount" jdbcType="DOUBLE"/>
<result property="amount" column="amount" jdbcType="DOUBLE"/>
<result property="payment" column="payment" jdbcType="DOUBLE"/>
<result property="receiverName" column="receiver_name" jdbcType="VARCHAR"/>
<result property="receiverMobile" column="receiver_mobile" jdbcType="VARCHAR"/>
<result property="address" column="address" jdbcType="VARCHAR"/>
<result property="province" column="province" jdbcType="VARCHAR"/>
<result property="city" column="city" jdbcType="VARCHAR"/>
<result property="town" column="town" jdbcType="VARCHAR"/>
<result property="orderTime" column="order_time" jdbcType="TIMESTAMP"/>
<result property="shipper" column="shipper" jdbcType="INTEGER"/>
<result property="shipType" column="ship_type" jdbcType="INTEGER"/>
<result property="shipStatus" column="ship_status" jdbcType="INTEGER"/>
<result property="shipCompany" column="ship_company" jdbcType="VARCHAR"/>
<result property="shipCode" column="ship_code" jdbcType="VARCHAR"/>
<result property="shipTime" column="ship_time" jdbcType="TIMESTAMP"/>
<result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
<result property="createBy" column="create_by" jdbcType="VARCHAR"/>
<result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
<result property="updateBy" column="update_by" jdbcType="VARCHAR"/>
</resultMap>
<sql id="Base_Column_List">
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
</sql>
</mapper>

6
serviceImpl/order/src/main/java/cn/qihangerp/module/order/mapper/OOrderItemMapper.java
View File

@ -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<OOrderItem> {
Page<OrderItemListVo> selectPageVo(@Param("page") Page<OrderItemListVo> page, @Param("qw") OrderItemListBo qw);

6
serviceImpl/order/src/main/java/cn/qihangerp/module/order/mapper/OOrderMapper.java
View File

@ -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<OOrder> {
List<OrderDiscountVo> getTaoOrderDiscount(String tid);

4
serviceImpl/order/src/main/java/cn/qihangerp/module/order/mapper/ORefundMapper.java
View File

@ -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<ORefund> {

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

@ -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;

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

@ -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;

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

@ -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;

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

@ -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;

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

@ -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;

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

@ -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;

6
serviceImpl/order/src/main/resources/mapper/OOrderItemMapper.xml
View File

@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cn.qihangerp.module.order.mapper.OOrderItemMapper">
<resultMap id="BaseResultMap" type="cn.qihangerp.module.order.domain.OOrderItem">
<resultMap id="BaseResultMap" type="cn.qihangerp.model.entity.OOrderItem">
<id property="id" column="id" jdbcType="BIGINT"/>
<result property="shopId" column="shop_id" jdbcType="BIGINT"/>
<result property="shopType" column="shop_type" jdbcType="INTEGER"/>
@ -50,7 +50,7 @@
create_by,update_time,update_by
</sql>
<select id="selectPageVo" parameterType="cn.qihangerp.module.order.domain.bo.OrderItemListBo" resultType="cn.qihangerp.module.order.domain.vo.OrderItemListVo">
<select id="selectPageVo" parameterType="cn.qihangerp.module.order.domain.bo.OrderItemListBo" resultType="cn.qihangerp.model.vo.OrderItemListVo">
SELECT
oi.*,o.shop_id,o.order_time,gs.outer_erp_sku_id
FROM o_order_item as oi
@ -84,7 +84,7 @@
</select>
<select id="selectOrderItemListByOrderId" parameterType="Long" resultType="cn.qihangerp.module.order.domain.vo.OrderItemListVo">
<select id="selectOrderItemListByOrderId" parameterType="Long" resultType="cn.qihangerp.model.vo.OrderItemListVo">
SELECT
oi.*,o.shop_id,o.order_time,gs.outer_erp_sku_id
FROM o_order_item as oi

4
serviceImpl/order/src/main/resources/mapper/OOrderMapper.xml
View File

@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cn.qihangerp.module.order.mapper.OOrderMapper">
<resultMap id="BaseResultMap" type="cn.qihangerp.module.order.domain.OOrder">
<resultMap id="BaseResultMap" type="cn.qihangerp.model.entity.OOrder">
<id property="id" column="id" jdbcType="BIGINT"/>
<result property="orderNum" column="order_num" jdbcType="VARCHAR"/>
<result property="shopType" column="shop_type" jdbcType="INTEGER"/>
@ -54,7 +54,7 @@
create_by,update_time,update_by
</sql>
<resultMap id="DiscountResultMap" type="cn.qihangerp.module.order.domain.vo.OrderDiscountVo">
<resultMap id="DiscountResultMap" type="cn.qihangerp.model.vo.OrderDiscountVo">
<result property="name" column="name" jdbcType="VARCHAR"/>
<result property="discountAmount" column="discount_amount" jdbcType="VARCHAR"/>
<result property="description" column="description" jdbcType="VARCHAR"/>

2
serviceImpl/order/src/main/resources/mapper/ORefundMapper.xml
View File

@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cn.qihangerp.module.order.mapper.ORefundMapper">
<resultMap id="BaseResultMap" type="cn.qihangerp.module.order.domain.ORefund">
<resultMap id="BaseResultMap" type="cn.qihangerp.model.entity.ORefund">
<id property="id" column="id" jdbcType="BIGINT"/>
<result property="refundNum" column="refund_num" jdbcType="VARCHAR"/>
<result property="refundType" column="refund_type" jdbcType="INTEGER"/>

18
vue/src/views/dou/order/index.vue
View File

@ -177,8 +177,7 @@
<el-button style="padding-right: 6px;padding-left: 6px"
v-if="scope.row.auditStatus === 0"
size="mini"
type="success"
plain
type="success" plain
icon="el-icon-success"
@click="handleConfirm(scope.row)"
v-hasPermi="['dou:order:edit']"
@ -311,7 +310,7 @@
</el-form>
<div slot="footer" class="dialog-footer" v-if="isAudit">
<el-button type="primary" @click="submitConfirmForm">确认发货</el-button>
<el-button type="primary" @click="submitConfirmForm" v-if="form.auditStatus===0">确认发货</el-button>
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
@ -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);
}
});
}

42
vue/src/views/order/index.vue
View File

@ -255,24 +255,30 @@
{{ parseTime(scope.row.orderTime) }}
</template>
</el-table-column>
<!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
<!-- <template slot-scope="scope">-->
<!-- <el-button-->
<!-- size="mini"-->
<!-- type="text"-->
<!-- icon="el-icon-view"-->
<!-- @click="handleDetail(scope.row)"-->
<!-- >详情</el-button>-->
<!--&lt;!&ndash; <div>&ndash;&gt;-->
<!--&lt;!&ndash; <el-button&ndash;&gt;-->
<!--&lt;!&ndash; size="mini"&ndash;&gt;-->
<!--&lt;!&ndash; type="success"&ndash;&gt;-->
<!--&lt;!&ndash; icon="el-icon-share"&ndash;&gt;-->
<!--&lt;!&ndash; @click="handleShip(scope.row)"&ndash;&gt;-->
<!--&lt;!&ndash; >订单发货</el-button>&ndash;&gt;-->
<!--&lt;!&ndash; </div>&ndash;&gt;-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-view"
@click="handleDetail(scope.row)"
>详情</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDetail(scope.row)"
>取消订单</el-button>
<div>
<el-button style="padding-right: 6px;padding-left: 6px"
size="mini" plain
type="success"
icon="el-icon-share"
@click="handleShip(scope.row)"
>订单发货</el-button>
</div>
</template>
</el-table-column>
</el-table>
<pagination