From 888f6f1b1ef89b78953f19215a7da8b2480f0018 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E5=AE=87=E5=A5=87?= Date: Sat, 16 Aug 2025 21:19:10 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/controller/xkt/ExpressCallbackController.java | 2 +- .../web/controller/xkt/vo/order/StoreOrderQueryVO.java | 4 ++++ .../com/ruoyi/xkt/dto/order/StoreOrderQueryDTO.java | 5 +++++ .../com/ruoyi/xkt/mapper/StoreProductColorMapper.java | 2 ++ .../ruoyi/xkt/service/impl/StoreOrderServiceImpl.java | 10 +++++++++- xkt/src/main/resources/mapper/StoreOrderMapper.xml | 6 ++++++ 6 files changed, 27 insertions(+), 2 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/ExpressCallbackController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/ExpressCallbackController.java index e4614048b..6ce49ca42 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/ExpressCallbackController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/ExpressCallbackController.java @@ -127,7 +127,7 @@ public class ExpressCallbackController extends XktBaseController { StoreOrderExpressTrackAddDTO dto = new StoreOrderExpressTrackAddDTO(); dto.setExpressWaybillNo(ztTrack.getBillCode()); dto.setAction(ztTrack.getAction()); - dto.setDescription(ztTrack.getActionTime() + " " + ztTrack.getRemark()); + dto.setDescription(ztTrack.getActionTime() + " " + ztTrack.getDesc()); dto.setExpressId(EExpressChannel.ZTO.getExpressId()); /** * 事件类型 diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/order/StoreOrderQueryVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/order/StoreOrderQueryVO.java index d21a875ea..85303c8ee 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/order/StoreOrderQueryVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/order/StoreOrderQueryVO.java @@ -9,6 +9,7 @@ import lombok.ToString; import javax.validation.constraints.NotNull; import java.util.Date; +import java.util.List; /** * @author liangyq @@ -19,6 +20,9 @@ import java.util.Date; @EqualsAndHashCode(callSuper = true) @ToString(callSuper = true) public class StoreOrderQueryVO extends BasePageVO { + + @ApiModelProperty(value = "订单ID集合") + private List storeOrderIds; /** * 档口ID */ diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/order/StoreOrderQueryDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/order/StoreOrderQueryDTO.java index 383d05bdb..788f97c87 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/order/StoreOrderQueryDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/order/StoreOrderQueryDTO.java @@ -6,6 +6,7 @@ import lombok.EqualsAndHashCode; import lombok.ToString; import java.util.Date; +import java.util.List; /** * @author liangyq @@ -15,6 +16,10 @@ import java.util.Date; @EqualsAndHashCode(callSuper = true) @ToString(callSuper = true) public class StoreOrderQueryDTO extends BasePageDTO { + /** + * 订单ID集合 + */ + private List storeOrderIds; /** * 档口ID */ diff --git a/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreProductColorMapper.java b/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreProductColorMapper.java index fc872b123..8c94f08d4 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreProductColorMapper.java +++ b/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreProductColorMapper.java @@ -7,6 +7,7 @@ import com.ruoyi.xkt.dto.storeProdColor.StoreProdColorResDTO; import com.ruoyi.xkt.dto.storeProduct.StoreProdPageDTO; import com.ruoyi.xkt.dto.storeProduct.StoreProdPageResDTO; import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; import java.util.List; @@ -16,6 +17,7 @@ import java.util.List; * @author ruoyi * @date 2025-03-26 */ +@Repository public interface StoreProductColorMapper extends BaseMapper { /** diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreOrderServiceImpl.java b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreOrderServiceImpl.java index b7bd65b63..cb0a2b9dc 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreOrderServiceImpl.java +++ b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreOrderServiceImpl.java @@ -69,6 +69,8 @@ public class StoreOrderServiceImpl implements IStoreOrderService { @Autowired private StoreColorMapper storeColorMapper; @Autowired + private StoreProductColorMapper storeProductColorMapper; + @Autowired private StoreProductFileMapper storeProductFileMapper; @Autowired private SysUserMapper sysUserMapper; @@ -1841,11 +1843,17 @@ public class StoreOrderServiceImpl implements IStoreOrderService { StoreProductColorSize spcs = spcsMap.get(detail.getStoreProdColorSizeId()); Assert.isTrue(BeanValidators.exists(spcs), "商品颜色尺码不存在"); StoreColor sc = scMap.get(spcs.getStoreColorId()); - Assert.isTrue(BeanValidators.exists(sc), "商品颜色不存在"); + Assert.isTrue(BeanValidators.exists(sc), "颜色不存在"); StoreProduct sp = spMap.get(spcs.getStoreProdId()); Assert.isTrue(BeanValidators.exists(sp), "商品不存在"); Assert.isTrue(storeId.equals(sp.getStoreId()), "系统不支持跨档口下单"); Assert.isTrue(EProductStatus.accessOrder(sp.getProdStatus()), "商品状态异常"); + StoreProductColor spc = CollUtil.getFirst(storeProductColorMapper.selectList(Wrappers.lambdaQuery(StoreProductColor.class) + .eq(StoreProductColor::getStoreProdId, spcs.getStoreProdId()) + .eq(StoreProductColor::getStoreColorId, spcs.getStoreColorId()) + .eq(XktBaseEntity::getDelFlag, Constants.UNDELETED))); + Assert.notNull(spc, "商品颜色不存在"); + Assert.isTrue(EProductStatus.accessOrder(spc.getProdStatus()), "商品颜色状态异常"); //相同商品颜色尺码只能存在一条明细 Assert.isFalse(spcsIdCheckSet.contains(spcs.getId()), "商品明细异常"); spcsIdCheckSet.add(spcs.getId()); diff --git a/xkt/src/main/resources/mapper/StoreOrderMapper.xml b/xkt/src/main/resources/mapper/StoreOrderMapper.xml index da47035b5..2aeb662ae 100644 --- a/xkt/src/main/resources/mapper/StoreOrderMapper.xml +++ b/xkt/src/main/resources/mapper/StoreOrderMapper.xml @@ -14,6 +14,12 @@ LEFT JOIN express e ON so.express_id = e.id so.del_flag = '0' + + AND so.id IN + + #{obj} + + AND so.store_id = #{storeId}