Merge branch 'dev' of http://113.31.163.91:7777/quanshu/mp-server.git into dev

mp-admin/src/main/resources/application.yml

@@ -128,11 +128,11 @@ cloud:
 #渠道端小程序appid和密钥
 wx-channel:
   appId: wxc3a684f1196f6e15
-  #appId: wxb86cb7f459fc3675
   appSecret: 7708655ba65f04de2a42f23d20ab4134
 #用户端小程序appid和密钥
 wx-user:
-  appId: wx8533800e393dbd6b
+  #appId: wx8533800e393dbd6b
+  appId: wxb86cb7f459fc3675
   appSecret: f7a104e09d6c2e55445be2a45c4ab551
 #公众号appid
 wxgzh:

mp-service/src/main/java/com/qs/mp/admin/domain/vo/UserCouponVO.java

@@ -1,52 +0,0 @@
-package com.qs.mp.admin.domain.vo;
-
-import com.alibaba.fastjson.annotation.JSONField;
-import com.alibaba.fastjson.serializer.SerializerFeature;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.qs.mp.admin.domain.Coupon;
-import com.qs.mp.admin.domain.TicketBox;
-import com.qs.mp.channel.domain.Channel;
-import com.qs.mp.common.enums.CouponDiscountTypeEnum;
-import com.qs.mp.common.enums.CouponDistributeTypeEnum;
-import com.qs.mp.common.enums.CouponStatusEnum;
-import com.qs.mp.common.enums.CouponTypeEnum;
-import com.qs.mp.common.enums.CouponUseAreaEnum;
-import java.util.Date;
-import java.util.List;
-import lombok.Data;
-
-/**
- * @describe 用户优惠券实体类
- * @auther quanshu
- * @create 2022-03-07 20:43:44
- */
-@Data
-public class UserCouponVO extends Coupon {
-
-  /**
-   * 主键
-   */
-  @TableId(value = "id", type = IdType.INPUT)
-  private String id;
-
-  /**
-   * 核销码
-   */
-  @TableField("verify_code")
-  private String verifyCode;
-
-  /**
-   * 使用订单ID
-   */
-  private String orderId;
-
-  /**
-   * 核销时间
-   */
-  private Date verifyTime;
-
-
-
-}

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

@@ -11,6 +11,8 @@ import com.qs.mp.admin.service.ICouponService;
 import com.qs.mp.admin.service.ICouponTicketService;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.qs.mp.channel.domain.Channel;
+import com.qs.mp.channel.service.IChannelService;
 import com.qs.mp.common.enums.CouponUseAreaEnum;
 import com.qs.mp.common.enums.UserCouponStatusEnum;
 import com.qs.mp.common.exception.ServiceException;
@@ -47,13 +49,13 @@ public class CouponServiceImpl extends ServiceImpl<CouponMapper, Coupon> impleme
 
   @Autowired
   private ICouponService couponService;
-  
+
   @Autowired
   private IUserCouponService userCouponService;
 
   @Autowired
   private IUserCouponChannelService userCouponChannelService;
-  
+
   @Autowired
   private ICouponTicketService couponTicketService;
 
@@ -63,6 +65,9 @@ public class CouponServiceImpl extends ServiceImpl<CouponMapper, Coupon> impleme
   @Autowired
   private IUserTicketOrderItemService userTicketOrderItemService;
 
+	@Autowired
+	private IChannelService channelService;
+
   @Override
   @Transactional
   public void distribute(Ticket ticket, Long userId, String couponId) {
@@ -80,7 +85,7 @@ public class CouponServiceImpl extends ServiceImpl<CouponMapper, Coupon> impleme
       userCoupon.setValidEnd(coupon.getValidEnd());
     }
     userCoupon.setStatus(UserCouponStatusEnum.UNUSED);
-    userCouponService.save(userCoupon);
+
 
     // 确定限定范围
     if (coupon.getUseArea() == CouponUseAreaEnum.POST_SCOPE) {
@@ -94,9 +99,12 @@ public class CouponServiceImpl extends ServiceImpl<CouponMapper, Coupon> impleme
       userCouponChannel.setUserCouponId(userCoupon.getId());
       userCouponChannel.setChannelId(orderItem.getChannelId());
       userCouponChannelService.save(userCouponChannel);
+			Channel channel = channelService.getById(orderItem.getChannelId());
+			userCoupon.setUseAreaDesc(channel.getName());
     }
+		userCouponService.save(userCoupon);
   }
-  
+
   @Override
 	@Transactional
 	public void saveCoupon(Coupon coupon, List<CouponTicket> ticketList) {
@@ -146,7 +154,7 @@ public class CouponServiceImpl extends ServiceImpl<CouponMapper, Coupon> impleme
 			}else {
 				throw new ServiceException("请联系管理员");
 			}
-			
+
 		}
 	}
 }

mp-service/src/main/java/com/qs/mp/framework/service/impl/WxUrlLinkServiceImpl.java

@@ -71,7 +71,7 @@ public class WxUrlLinkServiceImpl implements IWxUrlLinkService {
     Map<String, Object> jumpParam = new HashMap<>();
     jumpParam.put("path", path);
     jumpParam.put("query", query);
-    jumpParam.put("env_version", "trial");
+    jumpParam.put("env_version", "release");
     param.put("jump_wxa", jumpParam);
     // 有效时间超过31天的 Link 或永久有效的 Link 为长期有效Link，
     // 单个小程序总共可生成长期有效 Link 上限为10万个，请谨慎调用

mp-service/src/main/java/com/qs/mp/user/domain/UserCoupon.java

@@ -59,6 +59,12 @@ public class UserCoupon implements Serializable {
   @TableField("valid_end")
   private Date validEnd;
 
+  /**
+   * 适用范围说明
+   */
+  @TableField("use_area_desc")
+  private String useAreaDesc;
+
   /**
    * 使用订单ID
    */

mp-service/src/main/resources/mapper/user/UserCouponMapper.xml

@@ -10,6 +10,7 @@
         <result column="coupon_id" property="couponId" />
         <result column="valid_start" property="validStart" />
         <result column="valid_end" property="validEnd" />
+        <result column="use_area_desc" property="useAreaDesc" />
         <result column="order_id" property="orderId" />
         <result column="verify_time" property="verifyTime" />
         <result column="status" property="status" />
@@ -19,7 +20,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, user_id, verify_code, coupon_id, valid_start, valid_end, order_id, verify_time, status, created_time, updated_time
+        id, user_id, verify_code, coupon_id, valid_start, valid_end, use_area_desc, order_id, verify_time, status, created_time, updated_time
     </sql>
 
     <select id="listUserCouponVO" resultType="com.qs.mp.user.domain.vo.UserCouponVO">