Bläddra i källkod

//push

release_toaliyun_real
xhxu 3 år sedan
förälder
incheckning
ab9d6f0b6a
6 ändrade filer med 55 tillägg och 237 borttagningar
  1. +2
    -230
      mallinkAdmin/src/main/resources/db/migration/V2023030800001__coupon_press.sql
  2. +18
    -0
      mallinkAdmin/src/main/resources/db/migration/V2023030800001__upd_coupon_password.sql
  3. +7
    -4
      mallinkService/src/main/java/com/iformall/domain/po/WxCouponPassword.java
  4. +2
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxCouponPasswordServiceImpl.java
  5. +22
    -0
      mallinkService/src/main/java/com/iformall/utils/sign/AppUtils.java
  6. +4
    -3
      mallinkService/src/main/resources/mapper/WxCouponPasswordMapper.xml

+ 2
- 230
mallinkAdmin/src/main/resources/db/migration/V2023030800001__coupon_press.sql Visa fil

@@ -1,230 +1,2 @@
CREATE TABLE `wx_coupon_batch` (
`id` bigint(20) unsigned NOT NULL,
`tenant_id` varchar(5) NOT NULL,
`parent_tenant_id` varchar(5) DEFAULT NULL,
`name` varchar(100) DEFAULT NULL COMMENT '批次名称',
`status` int(1) NOT NULL DEFAULT '0' COMMENT '状态0-草稿 1-进行中 2-已停止',
`create_date` datetime DEFAULT NULL,
`update_date` datetime DEFAULT NULL,
`allow_count` int(3) NOT NULL DEFAULT '0' COMMENT '限购次数',
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;


CREATE TABLE `wx_coupon_batch_item` (
`id` bigint(20) unsigned NOT NULL,
`coupon_batch_id` bigint(20) NOT NULL COMMENT '批次id',
`coupon_id` bigint(20) NOT NULL COMMENT '砍价券id',
`coupon_batch_status` int(1) NOT NULL COMMENT '批次状态',
`create_date` datetime DEFAULT NULL,
`update_date` datetime DEFAULT NULL,
`tenant_id` varchar(5) NOT NULL,
`parent_tenant_id` varchar(5) DEFAULT NULL,
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;

create table wx_coupon_batch_0 like wx_coupon_batch;
create table wx_coupon_batch_1 like wx_coupon_batch;
create table wx_coupon_batch_2 like wx_coupon_batch;
create table wx_coupon_batch_3 like wx_coupon_batch;
create table wx_coupon_batch_4 like wx_coupon_batch;
create table wx_coupon_batch_5 like wx_coupon_batch;
create table wx_coupon_batch_6 like wx_coupon_batch;
create table wx_coupon_batch_7 like wx_coupon_batch;
create table wx_coupon_batch_8 like wx_coupon_batch;
create table wx_coupon_batch_9 like wx_coupon_batch;
create table wx_coupon_batch_10 like wx_coupon_batch;
create table wx_coupon_batch_11 like wx_coupon_batch;
create table wx_coupon_batch_12 like wx_coupon_batch;
create table wx_coupon_batch_13 like wx_coupon_batch;
create table wx_coupon_batch_14 like wx_coupon_batch;
create table wx_coupon_batch_15 like wx_coupon_batch;
create table wx_coupon_batch_16 like wx_coupon_batch;
create table wx_coupon_batch_17 like wx_coupon_batch;
create table wx_coupon_batch_18 like wx_coupon_batch;
create table wx_coupon_batch_19 like wx_coupon_batch;
create table wx_coupon_batch_20 like wx_coupon_batch;
create table wx_coupon_batch_21 like wx_coupon_batch;
create table wx_coupon_batch_22 like wx_coupon_batch;
create table wx_coupon_batch_23 like wx_coupon_batch;
create table wx_coupon_batch_24 like wx_coupon_batch;
create table wx_coupon_batch_25 like wx_coupon_batch;
create table wx_coupon_batch_26 like wx_coupon_batch;
create table wx_coupon_batch_27 like wx_coupon_batch;
create table wx_coupon_batch_28 like wx_coupon_batch;
create table wx_coupon_batch_29 like wx_coupon_batch;
create table wx_coupon_batch_30 like wx_coupon_batch;
create table wx_coupon_batch_31 like wx_coupon_batch;
create table wx_coupon_batch_32 like wx_coupon_batch;
create table wx_coupon_batch_33 like wx_coupon_batch;
create table wx_coupon_batch_34 like wx_coupon_batch;
create table wx_coupon_batch_35 like wx_coupon_batch;
create table wx_coupon_batch_36 like wx_coupon_batch;
create table wx_coupon_batch_37 like wx_coupon_batch;
create table wx_coupon_batch_38 like wx_coupon_batch;
create table wx_coupon_batch_39 like wx_coupon_batch;
create table wx_coupon_batch_40 like wx_coupon_batch;
create table wx_coupon_batch_41 like wx_coupon_batch;
create table wx_coupon_batch_42 like wx_coupon_batch;
create table wx_coupon_batch_43 like wx_coupon_batch;
create table wx_coupon_batch_44 like wx_coupon_batch;
create table wx_coupon_batch_45 like wx_coupon_batch;
create table wx_coupon_batch_46 like wx_coupon_batch;
create table wx_coupon_batch_47 like wx_coupon_batch;
create table wx_coupon_batch_48 like wx_coupon_batch;
create table wx_coupon_batch_49 like wx_coupon_batch;
create table wx_coupon_batch_50 like wx_coupon_batch;
create table wx_coupon_batch_51 like wx_coupon_batch;
create table wx_coupon_batch_52 like wx_coupon_batch;
create table wx_coupon_batch_53 like wx_coupon_batch;
create table wx_coupon_batch_54 like wx_coupon_batch;
create table wx_coupon_batch_55 like wx_coupon_batch;
create table wx_coupon_batch_56 like wx_coupon_batch;
create table wx_coupon_batch_57 like wx_coupon_batch;
create table wx_coupon_batch_58 like wx_coupon_batch;
create table wx_coupon_batch_59 like wx_coupon_batch;
create table wx_coupon_batch_60 like wx_coupon_batch;
create table wx_coupon_batch_61 like wx_coupon_batch;
create table wx_coupon_batch_62 like wx_coupon_batch;
create table wx_coupon_batch_63 like wx_coupon_batch;
create table wx_coupon_batch_64 like wx_coupon_batch;
create table wx_coupon_batch_65 like wx_coupon_batch;
create table wx_coupon_batch_66 like wx_coupon_batch;
create table wx_coupon_batch_67 like wx_coupon_batch;
create table wx_coupon_batch_68 like wx_coupon_batch;
create table wx_coupon_batch_69 like wx_coupon_batch;
create table wx_coupon_batch_70 like wx_coupon_batch;
create table wx_coupon_batch_71 like wx_coupon_batch;
create table wx_coupon_batch_72 like wx_coupon_batch;
create table wx_coupon_batch_73 like wx_coupon_batch;
create table wx_coupon_batch_74 like wx_coupon_batch;
create table wx_coupon_batch_75 like wx_coupon_batch;
create table wx_coupon_batch_76 like wx_coupon_batch;
create table wx_coupon_batch_77 like wx_coupon_batch;
create table wx_coupon_batch_78 like wx_coupon_batch;
create table wx_coupon_batch_79 like wx_coupon_batch;
create table wx_coupon_batch_80 like wx_coupon_batch;
create table wx_coupon_batch_81 like wx_coupon_batch;
create table wx_coupon_batch_82 like wx_coupon_batch;
create table wx_coupon_batch_83 like wx_coupon_batch;
create table wx_coupon_batch_84 like wx_coupon_batch;
create table wx_coupon_batch_85 like wx_coupon_batch;
create table wx_coupon_batch_86 like wx_coupon_batch;
create table wx_coupon_batch_87 like wx_coupon_batch;
create table wx_coupon_batch_88 like wx_coupon_batch;
create table wx_coupon_batch_89 like wx_coupon_batch;
create table wx_coupon_batch_90 like wx_coupon_batch;
create table wx_coupon_batch_91 like wx_coupon_batch;
create table wx_coupon_batch_92 like wx_coupon_batch;
create table wx_coupon_batch_93 like wx_coupon_batch;
create table wx_coupon_batch_94 like wx_coupon_batch;
create table wx_coupon_batch_95 like wx_coupon_batch;
create table wx_coupon_batch_96 like wx_coupon_batch;
create table wx_coupon_batch_97 like wx_coupon_batch;
create table wx_coupon_batch_98 like wx_coupon_batch;
create table wx_coupon_batch_99 like wx_coupon_batch;

drop table wx_coupon_batch;

create table wx_coupon_batch_item_0 like wx_coupon_batch_item;
create table wx_coupon_batch_item_1 like wx_coupon_batch_item;
create table wx_coupon_batch_item_2 like wx_coupon_batch_item;
create table wx_coupon_batch_item_3 like wx_coupon_batch_item;
create table wx_coupon_batch_item_4 like wx_coupon_batch_item;
create table wx_coupon_batch_item_5 like wx_coupon_batch_item;
create table wx_coupon_batch_item_6 like wx_coupon_batch_item;
create table wx_coupon_batch_item_7 like wx_coupon_batch_item;
create table wx_coupon_batch_item_8 like wx_coupon_batch_item;
create table wx_coupon_batch_item_9 like wx_coupon_batch_item;
create table wx_coupon_batch_item_10 like wx_coupon_batch_item;
create table wx_coupon_batch_item_11 like wx_coupon_batch_item;
create table wx_coupon_batch_item_12 like wx_coupon_batch_item;
create table wx_coupon_batch_item_13 like wx_coupon_batch_item;
create table wx_coupon_batch_item_14 like wx_coupon_batch_item;
create table wx_coupon_batch_item_15 like wx_coupon_batch_item;
create table wx_coupon_batch_item_16 like wx_coupon_batch_item;
create table wx_coupon_batch_item_17 like wx_coupon_batch_item;
create table wx_coupon_batch_item_18 like wx_coupon_batch_item;
create table wx_coupon_batch_item_19 like wx_coupon_batch_item;
create table wx_coupon_batch_item_20 like wx_coupon_batch_item;
create table wx_coupon_batch_item_21 like wx_coupon_batch_item;
create table wx_coupon_batch_item_22 like wx_coupon_batch_item;
create table wx_coupon_batch_item_23 like wx_coupon_batch_item;
create table wx_coupon_batch_item_24 like wx_coupon_batch_item;
create table wx_coupon_batch_item_25 like wx_coupon_batch_item;
create table wx_coupon_batch_item_26 like wx_coupon_batch_item;
create table wx_coupon_batch_item_27 like wx_coupon_batch_item;
create table wx_coupon_batch_item_28 like wx_coupon_batch_item;
create table wx_coupon_batch_item_29 like wx_coupon_batch_item;
create table wx_coupon_batch_item_30 like wx_coupon_batch_item;
create table wx_coupon_batch_item_31 like wx_coupon_batch_item;
create table wx_coupon_batch_item_32 like wx_coupon_batch_item;
create table wx_coupon_batch_item_33 like wx_coupon_batch_item;
create table wx_coupon_batch_item_34 like wx_coupon_batch_item;
create table wx_coupon_batch_item_35 like wx_coupon_batch_item;
create table wx_coupon_batch_item_36 like wx_coupon_batch_item;
create table wx_coupon_batch_item_37 like wx_coupon_batch_item;
create table wx_coupon_batch_item_38 like wx_coupon_batch_item;
create table wx_coupon_batch_item_39 like wx_coupon_batch_item;
create table wx_coupon_batch_item_40 like wx_coupon_batch_item;
create table wx_coupon_batch_item_41 like wx_coupon_batch_item;
create table wx_coupon_batch_item_42 like wx_coupon_batch_item;
create table wx_coupon_batch_item_43 like wx_coupon_batch_item;
create table wx_coupon_batch_item_44 like wx_coupon_batch_item;
create table wx_coupon_batch_item_45 like wx_coupon_batch_item;
create table wx_coupon_batch_item_46 like wx_coupon_batch_item;
create table wx_coupon_batch_item_47 like wx_coupon_batch_item;
create table wx_coupon_batch_item_48 like wx_coupon_batch_item;
create table wx_coupon_batch_item_49 like wx_coupon_batch_item;
create table wx_coupon_batch_item_50 like wx_coupon_batch_item;
create table wx_coupon_batch_item_51 like wx_coupon_batch_item;
create table wx_coupon_batch_item_52 like wx_coupon_batch_item;
create table wx_coupon_batch_item_53 like wx_coupon_batch_item;
create table wx_coupon_batch_item_54 like wx_coupon_batch_item;
create table wx_coupon_batch_item_55 like wx_coupon_batch_item;
create table wx_coupon_batch_item_56 like wx_coupon_batch_item;
create table wx_coupon_batch_item_57 like wx_coupon_batch_item;
create table wx_coupon_batch_item_58 like wx_coupon_batch_item;
create table wx_coupon_batch_item_59 like wx_coupon_batch_item;
create table wx_coupon_batch_item_60 like wx_coupon_batch_item;
create table wx_coupon_batch_item_61 like wx_coupon_batch_item;
create table wx_coupon_batch_item_62 like wx_coupon_batch_item;
create table wx_coupon_batch_item_63 like wx_coupon_batch_item;
create table wx_coupon_batch_item_64 like wx_coupon_batch_item;
create table wx_coupon_batch_item_65 like wx_coupon_batch_item;
create table wx_coupon_batch_item_66 like wx_coupon_batch_item;
create table wx_coupon_batch_item_67 like wx_coupon_batch_item;
create table wx_coupon_batch_item_68 like wx_coupon_batch_item;
create table wx_coupon_batch_item_69 like wx_coupon_batch_item;
create table wx_coupon_batch_item_70 like wx_coupon_batch_item;
create table wx_coupon_batch_item_71 like wx_coupon_batch_item;
create table wx_coupon_batch_item_72 like wx_coupon_batch_item;
create table wx_coupon_batch_item_73 like wx_coupon_batch_item;
create table wx_coupon_batch_item_74 like wx_coupon_batch_item;
create table wx_coupon_batch_item_75 like wx_coupon_batch_item;
create table wx_coupon_batch_item_76 like wx_coupon_batch_item;
create table wx_coupon_batch_item_77 like wx_coupon_batch_item;
create table wx_coupon_batch_item_78 like wx_coupon_batch_item;
create table wx_coupon_batch_item_79 like wx_coupon_batch_item;
create table wx_coupon_batch_item_80 like wx_coupon_batch_item;
create table wx_coupon_batch_item_81 like wx_coupon_batch_item;
create table wx_coupon_batch_item_82 like wx_coupon_batch_item;
create table wx_coupon_batch_item_83 like wx_coupon_batch_item;
create table wx_coupon_batch_item_84 like wx_coupon_batch_item;
create table wx_coupon_batch_item_85 like wx_coupon_batch_item;
create table wx_coupon_batch_item_86 like wx_coupon_batch_item;
create table wx_coupon_batch_item_87 like wx_coupon_batch_item;
create table wx_coupon_batch_item_88 like wx_coupon_batch_item;
create table wx_coupon_batch_item_89 like wx_coupon_batch_item;
create table wx_coupon_batch_item_90 like wx_coupon_batch_item;
create table wx_coupon_batch_item_91 like wx_coupon_batch_item;
create table wx_coupon_batch_item_92 like wx_coupon_batch_item;
create table wx_coupon_batch_item_93 like wx_coupon_batch_item;
create table wx_coupon_batch_item_94 like wx_coupon_batch_item;
create table wx_coupon_batch_item_95 like wx_coupon_batch_item;
create table wx_coupon_batch_item_96 like wx_coupon_batch_item;
create table wx_coupon_batch_item_97 like wx_coupon_batch_item;
create table wx_coupon_batch_item_98 like wx_coupon_batch_item;
create table wx_coupon_batch_item_99 like wx_coupon_batch_item;

drop table wx_coupon_batch_item;
ALTER TABLE `mallink`.`wx_coupon_password`
ADD COLUMN `pay_password` varchar(50) COMMENT '支付密码' AFTER `password`;

+ 18
- 0
mallinkAdmin/src/main/resources/db/migration/V2023030800001__upd_coupon_password.sql Visa fil

@@ -0,0 +1,18 @@
UPDATE `mallink`.`wx_third_party_config` SET `type` = 4 WHERE `type` = 2;


--测试
--UPDATE `mallink`.`tt_merchant_poi` set `parent_tenant_id` = '1031' WHERE `tenant_id` in ('1032','1033','1034');

--生产
UPDATE `mallink`.`tt_merchant_poi` set `parent_tenant_id` = '1052' WHERE `tenant_id` in ('1049','1053','1054','1055','1056','1057','1058','1059');





ALTER TABLE `mallink`.`tt_order_push_error`
MODIFY COLUMN `id` bigint(20) NOT NULL FIRST,
ADD COLUMN `main_id` bigint(20) NOT NULL COMMENT '主要ID' AFTER `parent_tenant_id`,
ADD COLUMN `msg_type` smallint(2) NOT NULL COMMENT 'EnumMsgRecordType' AFTER `main_id`,
ADD COLUMN `third_type` smallint(2) COMMENT 'EnumThirdPartyConfigType' AFTER `msg_type`;

+ 7
- 4
mallinkService/src/main/java/com/iformall/domain/po/WxCouponPassword.java Visa fil

@@ -29,24 +29,27 @@ public class WxCouponPassword extends TenantEntity {
@Excel(name = "兑换码", width = 20, orderNum = "2")
@io.swagger.annotations.ApiModelProperty(value="卡密",name="password")
private String password;
@Excel(name = "密码", width = 20, orderNum = "3")
@io.swagger.annotations.ApiModelProperty(value="密码",name="payPassword")
private String payPassword;
@TableField(exist = false)
private String passwordLike;
@Excel(name = "状态", width = 20, replace = {"初始_0", "发送中_1", "已发出_2", "已使用_3", "不可用_4"}, orderNum = "4")
@Excel(name = "状态", width = 20, replace = {"初始_0", "发送中_1", "已发出_2", "已使用_3", "不可用_4"}, orderNum = "5")
@io.swagger.annotations.ApiModelProperty(value="卡密状态: 0初始1信息发出中2信息已发出3已使用4已过期",name="status")
private Integer status;
@TableField(exist = false)
private List<Integer> statusList;
@Excel(name = "发送手机", width = 20, orderNum = "5")
@Excel(name = "发送手机", width = 20, orderNum = "6")
@io.swagger.annotations.ApiModelProperty(value="卡密发送到手机",name="sendedPhone")
private String sendedPhone;
@Excel(name = "会员卡号", width = 20, orderNum = "6")
@Excel(name = "会员卡号", width = 20, orderNum = "7")
@io.swagger.annotations.ApiModelProperty(value="卡包ID(coupon_order_id/card_id)",name="cardId")
private Long cardId;
@io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate")
private Date createDate;
@io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate")
private Date updateDate;
@Excel(name="过期时间",width = 20,format="yyyy-MM-dd", orderNum = "3")
@Excel(name="过期时间",width = 20,format="yyyy-MM-dd", orderNum = "4")
@io.swagger.annotations.ApiModelProperty(value="过期时间",name="expireDate")
private Date expireDate;



+ 2
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxCouponPasswordServiceImpl.java Visa fil

@@ -31,6 +31,7 @@ import com.iformall.service.ExcelService;
import com.iformall.service.WxCUserBasicInfoService;
import com.iformall.service.WxCouponPasswordService;

import com.iformall.utils.sign.AppUtils;
import org.apache.commons.beanutils.BeanUtils;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
@@ -303,6 +304,7 @@ public class WxCouponPasswordServiceImpl implements WxCouponPasswordService {
newOne.setCouponId(couponId);
newOne.setCouponShort(couponShortStr);
newOne.setPassword(pwList.get(i));
newOne.setPassword(AppUtils.getSortPwd());
newOne.setStatus(EnumCouponPasswordStatus.INIT.getCode());
newOne.setCreateDate(curDate);
newOne.setUpdateDate(curDate);


+ 22
- 0
mallinkService/src/main/java/com/iformall/utils/sign/AppUtils.java Visa fil

@@ -21,6 +21,9 @@ public class AppUtils {
"J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V",
"W", "X", "Y", "Z"};

private final static String[] numberChars = new String[]{"0", "1", "2", "3", "4", "5",
"6", "7", "8", "9"};

/**
* @Description: <p>
* 短8位UUID思想其实借鉴微博短域名的生成方式,但是其重复概率过高,而且每次生成4个,需要随即选取一个。
@@ -40,6 +43,25 @@ public class AppUtils {
return shortBuffer.toString();

}
/**
* @Description: <p>
* 短6位UUID数字密码
* 本算法利用10个可数字字符,通过随机生成32位UUID,由于UUID都为十六进制,所以将UUID分成8组,每4个为一组,然后通过模62操作,结果作为索引取出字符,
* 这样重复率大大降低。
* </p>
*/
public static String getSortPwd() {
StringBuffer shortBuffer = new StringBuffer();
String uuid = UUID.randomUUID().toString().replace("-", "");
for (int i = 0; i < 6; i++) {
String str = uuid.substring(i * 4, i * 4 + 4);
int x = Integer.parseInt(str, 16);
shortBuffer.append(numberChars[x % 0x0A]);
}
return shortBuffer.toString();

}


/**
* <p>


+ 4
- 3
mallinkService/src/main/resources/mapper/WxCouponPasswordMapper.xml Visa fil

@@ -9,6 +9,7 @@
<result column="coupon_id" jdbcType="BIGINT" property="couponId" />
<result column="coupon_short" jdbcType="VARCHAR" property="couponShort" />
<result column="password" jdbcType="VARCHAR" property="password" />
<result column="pay_password" jdbcType="VARCHAR" property="payPassword" />
<result column="status" jdbcType="INTEGER" property="status" />
<result column="sended_phone" jdbcType="VARCHAR" property="sendedPhone" />
<result column="card_id" jdbcType="BIGINT" property="cardId" />
@@ -20,7 +21,7 @@
</resultMap>
<sql id="allColumns">
`id`,`tenant_id`,`parent_tenant_id`,`price`,`coupon_id`,`coupon_short`,`password`,`status`,`sended_phone`,`card_id`,`create_date`,`update_date`,`expire_date`,`present_id`,`is_stop`
`id`,`tenant_id`,`parent_tenant_id`,`price`,`coupon_id`,`coupon_short`,`password`,`pay_password`,`status`,`sended_phone`,`card_id`,`create_date`,`update_date`,`expire_date`,`present_id`,`is_stop`
</sql>

<sql id="dynamicWhereConditions">
@@ -116,11 +117,11 @@
</select>

<insert id="insertCouponPasswds" parameterType="java.util.List">
INSERT INTO wx_coupon_password (`id`,`tenant_id`,`parent_tenant_id`,`coupon_id`,`coupon_short`,`password`,`status`,`create_date`,`update_date`)
INSERT INTO wx_coupon_password (`id`,`tenant_id`,`parent_tenant_id`,`coupon_id`,`coupon_short`,`password`,`pay_password`,`status`,`create_date`,`update_date`)
VALUES
<foreach collection="list" item="item" index="index" separator=",">
(
#{item.id},#{item.tenantId},#{item.parentTenantId},#{item.couponId},#{item.couponShort},#{item.password},#{item.status},
#{item.id},#{item.tenantId},#{item.parentTenantId},#{item.couponId},#{item.couponShort},#{item.password},#{item.payPassword},#{item.status},
#{item.createDate},#{item.updateDate}
)
</foreach>


Laddar…
Avbryt
Spara