更新管理端优惠券

src/main/java/com/sqx/modules/coupon/dao/TbCouponUserDao.java

@@ -28,6 +28,6 @@ public interface TbCouponUserDao extends BaseMapper<TbCouponUser> {
 
     int giveCoupon(List<String> userIdList, @Param("couponName")String couponName, @Param("couponPicture")String couponPicture,
                    @Param("createTime") String createTime, @Param("expirationTime")String expirationTime, @Param("minMoney")BigDecimal minMoney,@Param("goodsType") String goodsType,
-                   @Param("money")BigDecimal money, @Param("status")Integer status, @Param("endTime")String endTime,@Param("shopId") Long shopId);
+                   @Param("money")BigDecimal money, @Param("status")Integer status, @Param("endTime")String endTime,@Param("shopId") Long shopId,@Param("usedShopId") String usedShopId);
 
 }

src/main/java/com/sqx/modules/coupon/entity/TbCouponUser.java

@@ -86,4 +86,7 @@ public class TbCouponUser implements Serializable {
     private String shopName;
 
     public TbCouponUser() {}
+
+    @ApiModelProperty("优惠券可使用的商家")
+    private String usedShopId;
 }

src/main/java/com/sqx/modules/coupon/service/impl/TbCouponServiceImpl.java

@@ -140,7 +140,7 @@ public class TbCouponServiceImpl extends ServiceImpl<TbCouponDao, TbCoupon> impl
         String createTime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
         String expirationTime = new SimpleDateFormat("yyyy-MM-dd").format(date);
         tbCouponUserDao.giveCoupon(userIdList, tbCoupon.getCouponName(), tbCoupon.getCouponPicture(), createTime, expirationTime, tbCoupon.getMinMoney(), tbCoupon.getGoodsType(),
-                tbCoupon.getMoney(), 0,tbCoupon.getEndDate().toString(), shopId);
+                tbCoupon.getMoney(), 0,tbCoupon.getEndDate().toString(), shopId,tbCoupon.getUsedShopId());
         return Result.success();
     }
 

src/main/java/com/sqx/modules/coupon/service/impl/TbTbCouponUserServiceImpl.java

@@ -117,6 +117,7 @@ public class TbTbCouponUserServiceImpl extends ServiceImpl<TbCouponUserDao, TbCo
         }
 
         tbCouponUser.setShopId(tbCoupon.getShopId());
+        tbCouponUser.setUsedShopId(tbCoupon.getUsedShopId());
         tbCouponUserDao.insert(tbCouponUser);
 
         return Result.success();

src/main/resources/mapper/coupon/TbCouponUserMapper.xml

@@ -8,7 +8,11 @@
             and date_format(expiration_time,'%Y-%m-%d') > date_format(#{format},'%Y-%m-%d')
         </if>
         <if test="minMoney!=null and minMoney!=''">
-            and ((min_money &lt;= #{minMoney} and shop_id=0) or (min_money &lt;= #{minMoney} and shop_id=#{shopId}))
+            and (
+                (min_money &lt;= #{minMoney} and shop_id=0 and FIND_IN_SET(#{shopId},used_shop_id) )
+                or (min_money &lt;= #{minMoney} and shop_id=#{shopId})
+                or (min_money &lt;= #{minMoney} and shop_id=0 and used_shop_id =0)
+                )
         </if>
         order by expiration_time asc
     </select>
@@ -69,10 +73,10 @@
 
     <insert id="giveCoupon">
         insert into tb_coupon_user (user_id, coupon_name, coupon_picture, create_time, expiration_time, min_money,
-        goods_type, money, status, end_time, shop_id) values
+        goods_type, money, status, end_time, shop_id,used_shop_id) values
         <foreach collection="userIdList" item="item" separator=",">
             (#{item}, #{couponName}, #{couponPicture}, #{createTime}, #{expirationTime}, #{minMoney}, #{goodsType},
-            #{money}, #{status}, #{endTime}, #{shopId})
+            #{money}, #{status}, #{endTime}, #{shopId},#{usedShopId})
         </foreach>
     </insert>