门店供应链物品管理/记录

mp-admin/src/main/java/com/qs/mp/web/controller/api/admin/ChannelGoodsSettleMgrController.java

@@ -70,12 +70,12 @@ public class ChannelGoodsSettleMgrController extends BaseApiController {
         startPage();
         QueryWrapper<ChannelGoodsOrder> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq(null != queryParam && StringUtils.isNotBlank(queryParam.getOrderId()), "t1.order_id", queryParam.getOrderId());
-        queryWrapper.eq(null != queryParam && null != queryParam.getStatus(), "t1.`channel_id`", queryParam.getChannelId());
+        queryWrapper.eq(null != queryParam && null != queryParam.getChannelId(), "t1.`channel_id`", queryParam.getChannelId());
         queryWrapper.eq(null != queryParam && StringUtils.isNotBlank(queryParam.getTel()), "t1.`tel`", queryParam.getTel());
-        queryWrapper.eq(null != queryParam && null != queryParam.getSettleStatus(), "t2.status", queryParam.getSettleStatus());
+        queryWrapper.eq(null != queryParam && null != queryParam.getSettleStatus(), "t3.status", queryParam.getSettleStatus());
         queryWrapper.eq("t1.status", ChannelGoodsOrderStatusEnum.FINISHED.getValue());
-        queryWrapper.ge(null != queryParam && null != queryParam.getMinStock(), "t2.remain_qty", queryParam.getMinStock());
-        queryWrapper.le(null != queryParam && null != queryParam.getMaxStock(), "t2.remain_qty", queryParam.getMaxStock());
+        queryWrapper.ge(null != queryParam && null != queryParam.getMinStock(), "t3.remain_qty", queryParam.getMinStock());
+        queryWrapper.le(null != queryParam && null != queryParam.getMaxStock(), "t3.remain_qty", queryParam.getMaxStock());
         queryWrapper.ge(null != queryParam && null != queryParam.getStartTime(), "t1.created_time", queryParam.getStartTime());
         queryWrapper.le(null != queryParam && null != queryParam.getEndTime(), "t1.created_time", queryParam.getEndTime());
         queryWrapper.orderByDesc("t1.created_time", "t1.order_id");

mp-admin/src/main/java/com/qs/mp/web/controller/api/channel/ChannelGoodsController.java

@@ -69,6 +69,11 @@ public class ChannelGoodsController extends BaseApiController {
 
         List<GoodsVO> goodsVOList = mapperFacade.mapAsList(goodsList, GoodsVO.class);
 
+        for (GoodsVO goodsVO : goodsVOList) {
+            List<GoodsSku> skuList = goodsSkuService.list(new QueryWrapper<GoodsSku>().eq("goods_id", goodsVO.getGoodsId()));
+            goodsVO.setSkuList(skuList);
+        }
+
         return getDataTable(goodsVOList);
     }
 

mp-service/src/main/java/com/qs/mp/admin/domain/param/ChannelGoodsOrderQueryParam.java

@@ -53,6 +53,5 @@ public class ChannelGoodsOrderQueryParam {
     private Integer maxStock;
 
     @ApiModelProperty(value = "结算状态 1未结算 2已结算 3 结算中", required = false)
-    @JSONField(serialzeFeatures = SerializerFeature.WriteEnumUsingToString)
-    private ChannelGoodsSettleStatusTypeEnum settleStatus;
+    private String settleStatus;
 }

mp-service/src/main/java/com/qs/mp/admin/domain/param/CouponParam.java

@@ -124,7 +124,7 @@ public class CouponParam {
   @ApiModelProperty(value = "优惠卷详情")
   private String couponDetail;
 
-  @ApiModelProperty("是否去除采购商品")
+  @ApiModelProperty("是否去除已绑定过采购商品的采购优惠劵")
   private Boolean isExcludePurchaseCoupon;
 
 }