chunping 3 anni fa
parent
commit
ce7bc63960

+ 2 - 1
mp-admin/src/main/java/com/qs/mp/web/controller/api/user/UserExchangeController.java

@@ -75,7 +75,8 @@ public class UserExchangeController extends BaseApiController {
     startPage();
     List<Goods> goodsList = goodsService.list(new LambdaQueryWrapper<Goods>()
         .eq(null != goods.getCategoryId() && 0 != goods.getCategoryId(), Goods::getCategoryId, goods.getCategoryId())
-        .eq(Goods::getStatus, GoodsStatusEnum.PUT_ON));
+        .eq(Goods::getStatus, GoodsStatusEnum.PUT_ON)
+        .eq(Goods::getExchangeShow, 1));
     List<GoodsListVO> goodsListVOList = mapperFacade.mapAsList(goodsList, GoodsListVO.class);
     TableDataInfo rspData = getDataTable(goodsList);
     rspData.setRows(goodsListVOList);

+ 1 - 1
mp-service/src/main/java/com/qs/mp/admin/service/impl/CouponServiceImpl.java

@@ -80,7 +80,7 @@ public class CouponServiceImpl extends ServiceImpl<CouponMapper, Coupon> impleme
     UserCoupon userCoupon = new UserCoupon();
     userCoupon.setId(bizIdGenerator.newIdWithUidSharding(String.valueOf(userId)));
     userCoupon.setUserId(userId);
-    userCoupon.setVerifyCode(bizIdGenerator.newId());
+    userCoupon.setVerifyCode(bizIdGenerator.newIdWithUidSharding(String.valueOf(userId)));
     userCoupon.setCouponId(coupon.getCouponId());
     if (coupon.getDueDays() > 0) {
       userCoupon.setValidStart(DateUtils.getToday());