调整

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());
         /**
          * 事件类型

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<Long> storeOrderIds;
     /**
      * 档口ID
      */

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<Long> storeOrderIds;
     /**
      * 档口ID
      */

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<StoreProductColor> {
 
     /**

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());

xkt/src/main/resources/mapper/StoreOrderMapper.xml

@@ -14,6 +14,12 @@
             LEFT JOIN express e ON so.express_id = e.id
         <where>
             so.del_flag = '0'
+            <if test="storeOrderIds != null and !storeOrderIds.isEmpty()">
+                AND so.id IN
+                <foreach collection="storeOrderIds" item="obj" open="(" close=")" separator=",">
+                    #{obj}
+                </foreach>
+            </if>
             <if test="storeId != null">
                 AND so.store_id = #{storeId}
             </if>