diff --git a/CatmDogd-Mall-Front-test/src/views/marketing/wechatStock/index.vue b/CatmDogd-Mall-Front-test/src/views/marketing/wechatStock/index.vue index 5693a4e..4dead73 100644 --- a/CatmDogd-Mall-Front-test/src/views/marketing/wechatStock/index.vue +++ b/CatmDogd-Mall-Front-test/src/views/marketing/wechatStock/index.vue @@ -271,7 +271,7 @@ - + diff --git a/ruoyi-mall/src/main/java/com/cyl/h5/controller/H5CouponController.java b/ruoyi-mall/src/main/java/com/cyl/h5/controller/H5CouponController.java index 6755fc9..e2f0f28 100644 --- a/ruoyi-mall/src/main/java/com/cyl/h5/controller/H5CouponController.java +++ b/ruoyi-mall/src/main/java/com/cyl/h5/controller/H5CouponController.java @@ -82,13 +82,13 @@ public class H5CouponController extends BaseController Integer integer = orderMapper.selectCount(Wrappers. lambdaQuery() .eq(Order::getMemberId, member.getId())); - if (integer == 0){ +// if (integer == 0){ //新用户 WechatStock newUserCoupon = h5CouponService.getNewUserCoupon(); if (newUserCoupon != null){ list.add(0, newUserCoupon); } - } +// } for (WechatStock stock : list) { stock.setAlreadyReceived(wechatMemberCouponMapper.selectCount( diff --git a/ruoyi-mall/src/main/resources/mapper/marketing/WechatMemberCouponMapper.xml b/ruoyi-mall/src/main/resources/mapper/marketing/WechatMemberCouponMapper.xml index 79920dd..8c1eba6 100644 --- a/ruoyi-mall/src/main/resources/mapper/marketing/WechatMemberCouponMapper.xml +++ b/ruoyi-mall/src/main/resources/mapper/marketing/WechatMemberCouponMapper.xml @@ -56,6 +56,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + diff --git a/ruoyi-mall/src/main/resources/mapper/marketing/WechatStockMapper.xml b/ruoyi-mall/src/main/resources/mapper/marketing/WechatStockMapper.xml index d646a71..52cfcd9 100644 --- a/ruoyi-mall/src/main/resources/mapper/marketing/WechatStockMapper.xml +++ b/ruoyi-mall/src/main/resources/mapper/marketing/WechatStockMapper.xml @@ -105,8 +105,8 @@ create_by, create_time, update_by, update_time, send_type, discount_type, event_ send_type, discount_type, event_type, - coupon_poster, give_num, + coupon_poster, #{id}, @@ -135,8 +135,8 @@ create_by, create_time, update_by, update_time, send_type, discount_type, event_ #{sendType}, #{discountType}, #{eventType}, - couponPoster, giveNum, + #{couponPoster}, @@ -168,6 +168,7 @@ create_by, create_time, update_by, update_time, send_type, discount_type, event_ send_type = #{sendType}, discount_type = #{discountType}, event_type = #{eventType}, + coupon_poster = #{couponPoster}, where id = #{id}