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

Dev

See merge request quanshu/mp-server!229

mp-common/src/main/java/com/qs/mp/common/jsms/JSMSUtils.java

@@ -36,11 +36,8 @@ public class JSMSUtils {
 
     protected static final Logger logger = LoggerFactory.getLogger(JSMSUtils.class);
 
-    private static final String appkey = "2f17e0698d004ca7411a9ef6";
-    private static final String masterSecret = "a6446a6b8bf8a4be72bf86d4";
-/*
-    private static final String devKey = "242780bfdd7315dc1989fedb";
-    private static final String devSecret = "2f5ced2bef64167950e63d13";*/
+    private static final String appkey = "07abbc24df161327ea51d311";
+    private static final String masterSecret = "a7710786463881179a3d5b22";
     private static String env;
 
     @Value("${server.env}")
@@ -79,7 +76,7 @@ public class JSMSUtils {
     }
 
     public static SendSMSResult sendChannelActNotify(String mobile) {
-        return sendSMSResult(mobile, 206374);
+        return sendSMSResult(mobile, 206767);
     }
 
 

mp-service/src/main/java/com/qs/mp/admin/domain/param/CouponParam.java

@@ -1,18 +1,13 @@
 package com.qs.mp.admin.domain.param;
 
-import com.alibaba.fastjson.annotation.JSONField;
-import com.alibaba.fastjson.serializer.SerializerFeature;
 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 io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-
 import javax.validation.constraints.NotNull;
-
 import lombok.Data;
 
 /**
@@ -41,7 +36,6 @@ public class CouponParam {
    * 类型;1用户盲票购买优惠券、2用户门店消费优惠券、3经销商盲票采购优惠券
    */
   @ApiModelProperty(value = "代金券类型", required = false)
-  @JSONField(serialzeFeatures = SerializerFeature.WriteEnumUsingToString)
   private CouponTypeEnum type;
 
   /**
@@ -60,7 +54,6 @@ public class CouponParam {
    * 优惠类型;1代金券(默认)、2折扣券、3兑换券
    */
   @ApiModelProperty(value = "优惠类型;1代金券、2折扣券、3兑换券", required = false)
-  @JSONField(serialzeFeatures = SerializerFeature.WriteEnumUsingToString)
   private CouponDiscountTypeEnum discountType;
 
   /**
@@ -80,7 +73,6 @@ public class CouponParam {
    * 渠道代金券，渠道承担比例
    */
   @ApiModelProperty(value = "渠道代金券，渠道承担比例", required = true)
-  @JSONField(serialzeFeatures = SerializerFeature.WriteEnumUsingToString)
   private Integer channelSharedRate;
 
 
@@ -88,21 +80,18 @@ public class CouponParam {
    * 状态;off下架 on正常
    */
   @ApiModelProperty(value = "状态", required = false)
-  @JSONField(serialzeFeatures = SerializerFeature.WriteEnumUsingToString)
   private CouponStatusEnum status;
 
   /**
    * 使用范围;0通用 1生成券时指定范围 2发放时动态指定范围
    */
   @ApiModelProperty(value = "使用范围", required = true)
-  @JSONField(serialzeFeatures = SerializerFeature.WriteEnumUsingToString)
   private CouponUseAreaEnum useArea;
 
   /**
    * 发放方式;1系统发放(默认) 2用户主动领取
    */
   @ApiModelProperty(value = "发放方式", required = false)
-  @JSONField(serialzeFeatures = SerializerFeature.WriteEnumUsingToString)
   private CouponDistributeTypeEnum distributeType;
 
   /**

mp-service/src/main/java/com/qs/mp/channel/domain/param/VerifyParam.java

@@ -22,11 +22,15 @@ public class VerifyParam {
 	@NotNull(message = "联系人不能为空")
 	@ApiModelProperty(value = "联系人",required=true)
 	private String contact;
-	
+
 	@NotNull(message = "门店类型不能为空")
 	@ApiModelProperty(value = "门店类型",required=true)
 	private SiteTypeEnum siteType;
 
+	@NotNull(message = "门店名称不能为空")
+	@ApiModelProperty(value = "门店名称",required=true)
+	private String siteName;
+
 	@NotNull(message = "省ID不能为空")
 	@ApiModelProperty(value = "省ID",required=true)
 	private Long provinceId;
@@ -50,7 +54,7 @@ public class VerifyParam {
 	@NotNull(message = "区不能为空")
 	@ApiModelProperty(value = "区",required=true)
 	private String area;
-	
+
 	@NotNull(message = "详细地址不能为空")
 	@ApiModelProperty(value = "详细地址",required=true)
 	private String address;
@@ -58,7 +62,7 @@ public class VerifyParam {
 	@NotNull(message = "营业执照不能为空")
 	@ApiModelProperty(value = "营业执照",required=true)
 	private String bizLicensePic;
-	
+
 	@NotNull(message = "门店照片不能为空")
 	@ApiModelProperty(value = "门店照片",required=true)
 	private String doorPic;

mp-service/src/main/resources/mapper/channel/ChannelMapper.xml

@@ -10,6 +10,7 @@
         <result column="parent_id" property="parentId" />
         <result column="level" property="level" />
         <result column="site_type" property="siteType" />
+        <result column="site_name" property="siteName" />
         <result column="comm_rate" property="commRate" />
         <result column="province" property="province" />
         <result column="province_id" property="provinceId" />
@@ -36,7 +37,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        channel_id, channel_no, name, parent_id, level, site_type, comm_rate, province, province_id, city, city_id, area, area_id, address, contact, mobile, user_id, money, frozen_money, certify_status, verify_status, biz_license_pic, door_pic, memo, invite_pic, status, created_time, updated_time
+        channel_id, channel_no, name, parent_id, level, site_type, site_name, comm_rate, province, province_id, city, city_id, area, area_id, address, contact, mobile, user_id, money, frozen_money, certify_status, verify_status, biz_license_pic, door_pic, memo, invite_pic, status, created_time, updated_time
     </sql>
 
     <!-- 查询子渠道信息 -->
@@ -54,7 +55,7 @@
 		where t1.`level`= 0
 		and (t1.channel_no like concat(#{channelNo}, '.%') or t1.channel_no = #{channelNo})
     </select>
-    
+
      <!-- 查询渠道信息 -->
     <select id="getChannelVoById" resultType="com.qs.mp.channel.domain.vo.ChannelVO">
 		select t1.* , t2.name parentName