Merge branch 'dev' into 'mp-server-test'

Dev

See merge request quanshu/mp-server!619

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

@@ -21,6 +21,7 @@ import com.qs.mp.admin.service.ITicketBoxService;
 import com.qs.mp.channel.domain.Channel;
 import com.qs.mp.channel.service.IChannelService;
 import com.qs.mp.common.annotation.Log;
+import com.qs.mp.common.constant.Constants;
 import com.qs.mp.common.constant.UserConstants;
 import com.qs.mp.common.core.domain.AjaxResult;
 import com.qs.mp.common.core.page.TableDataInfo;
@@ -213,7 +214,7 @@ public class CouponMgrController extends BaseApiController {
 //			return AjaxResult.error("使用范围为指定盲票时需要至少选择一种盲票");
 //		}
 		if(StringUtils.isBlank(coupon.getPicUrl())) {
-			coupon.setPicUrl("coupon_def.jpeg");
+			coupon.setPicUrl(Constants.COUPON_PIC);
 		}
 		// 3.插入数据
 		try {

mp-common/src/main/java/com/qs/mp/common/constant/Constants.java

@@ -158,4 +158,14 @@ public class Constants
      * LDAP 远程方法调用
      */
     public static final String LOOKUP_LDAP = "ldap://";
+
+    /**
+     * 优惠券默认图片
+     */
+    public static final String COUPON_PIC = "coupon.png";
+
+    /**
+     * 盲豆默认图片
+     */
+    public static final String MANGDOU_PIC = "md.png";
 }

mp-common/src/main/java/com/qs/mp/common/enums/PrizeStorageInTypeEnum.java

@@ -11,7 +11,7 @@ import com.baomidou.mybatisplus.annotation.IEnum;
  */
 public enum PrizeStorageInTypeEnum implements IEnum<Integer> {
 
-  TICKET_CASHED(1, "奖品兑奖"),
+  TICKET_CASHED(1, "盲票奖品"),
   COIN_EXCHANGE(2, "盲豆兑换"),
   MARKETING(3, "营销活动");
 

mp-service/src/main/java/com/qs/mp/admin/service/impl/CouponPkgServiceImpl.java

@@ -19,6 +19,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.qs.mp.admin.service.ICouponService;
 import com.qs.mp.channel.domain.Channel;
 import com.qs.mp.channel.service.IChannelService;
+import com.qs.mp.common.constant.Constants;
 import com.qs.mp.common.enums.CouponPkgStatusEnum;
 import com.qs.mp.common.enums.CouponUseAreaEnum;
 import com.qs.mp.common.enums.UserCouponStatusEnum;
@@ -158,7 +159,7 @@ public class CouponPkgServiceImpl extends ServiceImpl<CouponPkgMapper, CouponPkg
         // 更新券包
         couponPkg = new CouponPkg();
         BeanUtils.copyProperties(couponPkgParam, couponPkg);
-        couponPkg.setPicUrl("coupon_def.jpeg");
+        couponPkg.setPicUrl(Constants.COUPON_PIC);
         this.updateById(couponPkg);
 
         // 创建券包明细
@@ -186,7 +187,7 @@ public class CouponPkgServiceImpl extends ServiceImpl<CouponPkgMapper, CouponPkg
 
         CouponPkg couponPkg = new CouponPkg();
         BeanUtils.copyProperties(couponPkgParam, couponPkg);
-        couponPkg.setPicUrl("coupon_def.jpeg");
+        couponPkg.setPicUrl(Constants.COUPON_PIC);
         this.save(couponPkg);
 
         List<CouponPkgItem> params = new ArrayList<>();

mp-service/src/main/java/com/qs/mp/admin/service/impl/MarketingServiceImpl.java

@@ -11,6 +11,7 @@ import com.qs.mp.admin.domain.vo.MarketingListVO;
 import com.qs.mp.admin.mapper.MarketingMapper;
 import com.qs.mp.admin.service.*;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.qs.mp.common.constant.Constants;
 import com.qs.mp.common.core.domain.AjaxResult;
 import com.qs.mp.common.core.redis.DistributedLocker;
 import com.qs.mp.common.core.redis.RedisCache;
@@ -513,7 +514,7 @@ public class MarketingServiceImpl extends ServiceImpl<MarketingMapper, Marketing
                     awardsPrize.setPicUrl(couponPkg.getPicUrl());
                 } else {
                     awardsPrize.setTitle("盲豆");
-                    awardsPrize.setPicUrl("md.jpeg");
+                    awardsPrize.setPicUrl(Constants.MANGDOU_PIC);
                 }
                 marketingAwardsPrizeList.add(awardsPrize);
             }

mp-service/src/main/java/com/qs/mp/admin/service/impl/TicketBoxServiceImpl.java

@@ -16,6 +16,7 @@ import com.qs.mp.admin.mapper.TicketBoxMapper;
 import com.qs.mp.admin.service.*;
 import com.qs.mp.channel.domain.Channel;
 import com.qs.mp.channel.service.IChannelService;
+import com.qs.mp.common.constant.Constants;
 import com.qs.mp.common.enums.*;
 import com.qs.mp.common.exception.ServiceException;
 import com.qs.mp.common.pulsar.PulsarClientService;
@@ -212,7 +213,7 @@ public class TicketBoxServiceImpl extends ServiceImpl<TicketBoxMapper, TicketBox
             awardsPrize.setPicUrl(couponPkg.getPicUrl());
           } else {
             awardsPrize.setTitle("盲豆");
-            awardsPrize.setPicUrl("md.jpeg");
+            awardsPrize.setPicUrl(Constants.MANGDOU_PIC);
           }
           ticketAwardsPrizeList.add(awardsPrize);
         } else {
@@ -389,7 +390,7 @@ public class TicketBoxServiceImpl extends ServiceImpl<TicketBoxMapper, TicketBox
           awardsPrize.setPicUrl(couponPkg.getPicUrl());
         } else {
           awardsPrize.setTitle("盲豆");
-          awardsPrize.setPicUrl("md.jpeg");
+          awardsPrize.setPicUrl(Constants.MANGDOU_PIC);
         }
         awardsPrizeList.add(awardsPrize);
       }