Просмотр исходного кода

Merge branch 'release_real_202008' of https://git.malls.iformall.com/server/formallProject into release_real_202008

release_toaliyun_real
xiaohanzi 5 лет назад
Родитель
Сommit
dd69a76e36
10 измененных файлов: 31 добавлений и 18 удалений
  1. +7
    -1
      mallinkAdmin/src/main/resources/db/migration/V202007311142__GROUP__ADD_002.sql
  2. +12
    -5
      mallinkAdmin/src/main/resources/db/migration/V202007311200__FOR_MEMBER_ONLY_001.sql
  3. +1
    -1
      mallinkCApi/src/main/java/com/iformall/controller/WxMsgValidationcodeController.java
  4. +1
    -1
      mallinkCApi/src/main/java/com/iformall/controller/WxPayOrderController.java
  5. +1
    -1
      mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java
  6. +1
    -1
      mallinkCApi/src/main/java/com/iformall/interceptor/AuthorizationInterceptor.java
  7. +1
    -1
      mallinkService/src/main/java/com/iformall/domain/po/base/BaseCUserEntity.java
  8. +1
    -1
      mallinkService/src/main/java/com/iformall/service/pay/service/pay/wx/miniApp/maPay/WxMiniMaPayAdapterService.java
  9. +5
    -5
      mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml
  10. +1
    -1
      mallinkService/src/main/resources/mapper/WxCUserMapper.xml

+ 7
- 1
mallinkAdmin/src/main/resources/db/migration/V202007311142__GROUP__ADD_002.sql Просмотреть файл

@@ -1,4 +1,4 @@
update mall_sale_type set menus = '[1, 2, 5, 6, 8, 10, 50, 101, 102, 104, 105, 106, 108, 203, 204, 206, 207, 501, 502, 503, 504, 509, 591, 595, 601, 621, 622, 623, 624, 625, 626, 627, 901, 902]' where id=100
update mall_sale_type set menus = '[1, 2, 5, 6, 8, 10, 50, 101, 102, 104, 105, 106, 108, 203, 204, 206, 207, 501, 502, 503, 504, 505, 506, 507, 511, 512, 522, 523, 509, 591, 595, 601, 621, 622, 623, 624, 625, 626, 627, 901, 902]' where id=100


CREATE DEFINER=`root`@`%` PROCEDURE `init_after_group`(IN tenantId VARCHAR(25),IN subTenantIds VARCHAR(250))
@@ -32,3 +32,9 @@ BEGIN
COMMIT;
END IF;
END;


--两张表做手动初始化
--wx_c_user_basic_info ---final_tenant_id
--wx_c_user_tags ---tenant_id(同final_tenant_id)
----------

+ 12
- 5
mallinkAdmin/src/main/resources/db/migration/V202007311200__FOR_MEMBER_ONLY_001.sql Просмотреть файл

@@ -7,24 +7,33 @@ update `wx_c_user` set user_id = id where id in (select id from wx_c_user_basic_
ALTER TABLE `wx_c_user_basic_info`
ADD COLUMN `final_tenant_id` varchar(5) NOT NULL COMMENT '归属租户ID' AFTER `parent_tenant_id`;

DROP INDEX `PHONE_UNIQUE`,
ADD UNIQUE INDEX `PHONE_UNIQUE`(`final_tenant_id`, `phone`) USING BTREE;

update wx_c_user_basic_info set final_tenant_id = parent_tenant_id;
update wx_c_user_basic_info set final_tenant_id = tenant_id where (parent_tenant_id is null or trim(parent_tenant_id) = "");

DROP INDEX `PHONE_UNIQUE`,
ADD UNIQUE INDEX `PHONE_UNIQUE`(`final_tenant_id`, `phone`) USING BTREE;


ALTER TABLE `wx_c_user_basic_info`
ADD COLUMN `login_count` int(11) DEFAULT 0 COMMENT '登陆次数' AFTER `active_time`;

update wx_c_user_basic_info wcubi set wcubi.login_count = (select wcu.login_count from wx_c_user wcu where wcu.id=wcubi.id);


ALTER TABLE `wx_c_user_basic_info`
ADD COLUMN `avatar_url` VARCHAR(225) DEFAULT 0 COMMENT '头像地址' AFTER `nick_name`;

update wx_c_user_basic_info wcubi set wcubi.avatar_url = (select wcu.avatar_url from wx_c_user wcu where wcu.id=wcubi.id);


ALTER TABLE `wx_c_user_basic_info`
MODIFY COLUMN `phone` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '微信用户绑定的手机号' AFTER `final_tenant_id`;

ALTER TABLE `wx_c_user_basic_info`
MODIFY COLUMN `tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci COMMENT '租户ID' AFTER `id`;



ALTER TABLE `wx_coupon_order`
ADD COLUMN `pay_vendor` SMALLINT(3) NOT NULL DEFAULT 1 COMMENT '订单渠道,EnumPayWay.class';

@@ -41,7 +50,5 @@ ADD COLUMN `plat` SMALLINT(3) NOT NULL DEFAULT 1 COMMENT 'app平台 1:微信 2:
ALTER TABLE `wx_profit_sharing_receiver`
ADD COLUMN `plat` SMALLINT(3) NOT NULL DEFAULT 1 COMMENT '平台 1:微信 2:阿里 3:头条';

update mall_sale_type set menus = '[1, 2, 5, 6, 8, 10, 50, 101, 102, 104, 105, 106, 108, 203, 204, 206, 207, 501, 502, 503, 504, 505, 506, 507, 511, 512, 522, 523, 509, 591, 595, 601, 621, 622, 623, 624, 625, 626, 627, 901, 902]' where id=100




+ 1
- 1
mallinkCApi/src/main/java/com/iformall/controller/WxMsgValidationcodeController.java Просмотреть файл

@@ -75,7 +75,7 @@ public class WxMsgValidationcodeController extends BaseController {
if (rd.code == Result.SUCCESS) {
// 更新到basicinfo
Long userId = user.getId();
if (user.isBasicInfo()) {
if (user.basicInfoIs()) {
userId = user.getUserId();
}
Long basicUserId = saveToBasicInfoByCUser(phone, user.getNickName(), user.getAvatarUrl(), user.getGender(), userId);


+ 1
- 1
mallinkCApi/src/main/java/com/iformall/controller/WxPayOrderController.java Просмотреть файл

@@ -89,7 +89,7 @@ public class WxPayOrderController extends BaseController {
}

WxCUser user = getWxCUser();
if (!user.isBasicInfo()) {
if (!user.basicInfoIs()) {
logger.error("暂未成为会员,请授权手机号");
return new ResultData(ErrorCode.USER_IS_NOT_MEMBER.getCode(), "暂未成为会员,请授权手机号");
}


+ 1
- 1
mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java Просмотреть файл

@@ -767,7 +767,7 @@ public class WxUserGrantController extends BaseController {
org.springframework.beans.BeanUtils.copyProperties(user, userVo);
userVo.setScore(0);
userVo.setCredit(0);
if(user.isBasicInfo()){
if(user.basicInfoIs()){
WxCUserBasicInfo wxCUserBasicInfo = wxCUserBasicInfoService.getById(user.getUserId());
if (wxCUserBasicInfo != null) {
userVo.setScore(wxCUserBasicInfo.getPoins());


+ 1
- 1
mallinkCApi/src/main/java/com/iformall/interceptor/AuthorizationInterceptor.java Просмотреть файл

@@ -70,7 +70,7 @@ public class AuthorizationInterceptor extends HandlerInterceptorAdapter {
if (StringUtils.isNotBlank(cUser.getParentTenantId())) {
request.setAttribute(Constant.PARENT_TENANT_ID, cUser.getParentTenantId());
}
if(cUser.isBasicInfo()){
if(cUser.basicInfoIs()){
request.setAttribute(Constant.LOGIN_MEMBER_KEY, cUser.getUserId());
}


+ 1
- 1
mallinkService/src/main/java/com/iformall/domain/po/base/BaseCUserEntity.java Просмотреть файл

@@ -32,7 +32,7 @@ public class BaseCUserEntity extends TenantEntity {
* 是否是会员
* @return
*/
public boolean isBasicInfo() {
public boolean basicInfoIs() {
return UserUtil.CuserIsBasicInfo(this.getUserId());
}
}

+ 1
- 1
mallinkService/src/main/java/com/iformall/service/pay/service/pay/wx/miniApp/maPay/WxMiniMaPayAdapterService.java Просмотреть файл

@@ -233,7 +233,7 @@ public class WxMiniMaPayAdapterService extends BaseWxPayAdapterService implement
throw new MallinkException(ErrorCode.SYS_SERVER_ERROR.getCode(), "微信扫码支付添加微信C端用户失败");
}
}else {
if (user1.isBasicInfo()) {
if (user1.basicInfoIs()) {
userId = user1.getUserId();
}
}


+ 5
- 5
mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml Просмотреть файл

@@ -1011,8 +1011,8 @@

<select id="findImportUserCount" resultType="java.lang.Long">
SELECT count(distinct cubi.id) FROM wx_c_user_basic_info cubi
left join wx_c_user cu on cubi.id=cu.user_id where cu.id is null
where 1=1
left join wx_c_user cu on cubi.id=cu.user_id
where cu.id is null
<if test=" null != finalTenantId and '' != finalTenantId">
and cubi.`final_tenant_id` = #{finalTenantId}
</if>
@@ -1020,8 +1020,8 @@

<select id="findImportUserCount1" resultType="java.lang.Long">
SELECT count(distinct cubi.id) FROM wx_c_user_basic_info cubi
left join wx_c_user cu on cubi.id=cu.user_id where cu.id is null
where 1=1
left join wx_c_user cu on cubi.id=cu.user_id
where cu.id is null
<if test=" null != tenantId and '' != tenantId">
and cu.`tenant_id` = #{tenantId}
</if>
@@ -1039,7 +1039,7 @@
</if>
</select>

<select id="findGrowUserCount1" parameterType="com.iformall.domain.dto.WxCUserBasicInfoDto" resultType="java.lang.Long">
<select id="findGrowUserCount1" resultType="java.lang.Long">
SELECT count(distinct cubi.id) FROM wx_c_user_basic_info cubi
left join wx_c_user cu on cubi.id=cu.user_id
where cu.id is not null


+ 1
- 1
mallinkService/src/main/resources/mapper/WxCUserMapper.xml Просмотреть файл

@@ -251,7 +251,7 @@
</resultMap>

<select id="findByToken" resultMap="BaseCUserResultMap">
select * from wx_c_user
select id,user_id,tenant_id,parent_tenant_id,token,expire_time from wx_c_user
where `token` = #{token}
</select>



Загрузка…
Отмена
Сохранить