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

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

@@ -14,10 +14,7 @@ import com.qs.mp.admin.domain.param.CouponParam;
 import com.qs.mp.admin.domain.param.GoodsParam;
 import com.qs.mp.admin.domain.vo.CouponVO;
 import com.qs.mp.admin.domain.vo.GoodsVO;
-import com.qs.mp.admin.service.ICouponChannelService;
-import com.qs.mp.admin.service.ICouponService;
-import com.qs.mp.admin.service.ICouponTicketService;
-import com.qs.mp.admin.service.ITicketBoxService;
+import com.qs.mp.admin.service.*;
 import com.qs.mp.channel.domain.Channel;
 import com.qs.mp.channel.domain.ChannelUserRel;
 import com.qs.mp.channel.domain.vo.ChannelVO;
@@ -91,6 +88,9 @@ public class CouponMgrController extends BaseApiController {
 
     @Autowired
     private IUserCouponService userCouponService;
+
+    @Autowired
+    private IGoodsService goodsService;
     /**
      * 获取代金券列表信息，支持翻页
      *
@@ -103,6 +103,12 @@ public class CouponMgrController extends BaseApiController {
         @ApiResponse(code = 200, message = "成功", response = Coupon.class)
     )
     public TableDataInfo listCoupon(@RequestBody CouponParam coupon) {
+        if (CouponTypeEnum.SITE_GOODS_VERITY.equals(coupon.getType())) {
+            // 排除采购商品已绑定的优惠劵
+            List<Goods> goodsList = goodsService.list(new LambdaQueryWrapper<Goods>().eq(Goods::getType, 3));
+            List<Long> couponIdList = goodsList.stream().map(Goods::getRefId).map(Long::new).collect(Collectors.toList());
+            coupon.setExcludeCouponIds(couponIdList);
+        }
         List<Coupon> list = new ArrayList<Coupon>();
         startPage();
         QueryWrapper<Coupon> queryWrapper = new QueryWrapper<Coupon>();

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

@@ -238,6 +238,8 @@ public class GoodsMgrController extends BaseApiController {
 
         queryWrapper.lambda()
                 .eq(null != queryParam.getType(), Goods::getType, queryParam.getType());
+        queryWrapper.lambda()
+                .notIn(null != queryParam.getIsExcludePurchaseGoods() && queryParam.getIsExcludePurchaseGoods(), Goods::getType, 3);
 
         // 状态
         queryWrapper.lambda()

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

@@ -89,5 +89,8 @@ public class GoodsQueryParam {
     @JSONField(serialzeFeatures = SerializerFeature.WriteEnumUsingToString)
     private GoodsStatusEnum status;
 
+    @ApiModelProperty("是否去除采购商品")
+    private Boolean isExcludePurchaseGoods;
+
 
 }

mp-service/src/main/java/com/qs/mp/channel/service/impl/ChannelCouponVerifyLogServiceImpl.java

@@ -116,6 +116,7 @@ public class ChannelCouponVerifyLogServiceImpl extends ServiceImpl<ChannelCoupon
       }
       boolean rst = channelGoodsService.update(new LambdaUpdateWrapper<ChannelGoods>()
               .set(ChannelGoods::getRemainQty, channelGoods.getRemainQty() - 1)
+              .set(ChannelGoods::getSettleQty,channelGoods.getSettleQty() -1)
               .set(ChannelGoods::getVerifyQty, channelGoods.getVerifyQty() + 1)
               .set(channelGoods.getQuantity() == channelGoods.getVerifyQty() + 1,ChannelGoods::getStatus, ChannelGoodsSettleStatusTypeEnum.Verify)
               .eq(ChannelGoods::getId, channelGoods.getId()));

mp-service/src/main/java/com/qs/mp/channel/service/impl/ChannelGoodsOrderServiceImpl.java

@@ -238,6 +238,7 @@ public class ChannelGoodsOrderServiceImpl extends ServiceImpl<ChannelGoodsOrderM
             channelGoods.setSupplierId(item.getSupplierId());
             channelGoods.setQuantity(item.getGoodsNum());
             channelGoods.setRemainQty(item.getGoodsNum());
+            channelGoods.setSettleQty(item.getGoodsNum());
             channelGoods.setPurchasePrice(goods.getPurchasePrice());
             channelGoods.setPurchaseCost(goods.getPurchaseCost());
             goodsList.add(channelGoods);
@@ -277,6 +278,7 @@ public class ChannelGoodsOrderServiceImpl extends ServiceImpl<ChannelGoodsOrderM
                 channelGoods.setSupplierId(item.getSupplierId());
                 channelGoods.setQuantity(item.getGoodsNum());
                 channelGoods.setRemainQty(item.getGoodsNum());
+                channelGoods.setSettleQty(item.getGoodsNum());
                 channelGoods.setPurchasePrice(goods.getPurchasePrice());
                 channelGoods.setPurchaseCost(goods.getPurchaseCost());
                 goodsList.add(channelGoods);