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

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

release_toaliyun_real
xiaohanzi 5 лет назад
Родитель
Сommit
9f724bc526
3 измененных файлов: 5 добавлений и 5 удалений
  1. +0
    -2
      mallinkAdmin/src/main/resources/db/migration/V202105270001__tt_add_.sql
  2. +2
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java
  3. +3
    -1
      mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml

+ 0
- 2
mallinkAdmin/src/main/resources/db/migration/V202105270001__tt_add_.sql Просмотреть файл

@@ -15,5 +15,3 @@ UPDATE wx_merchant SET entry_amount = 0 ;
ALTER TABLE `wx_merchant`
ADD COLUMN `mark_time` datetime(0) COMMENT '记号时间' AFTER `mark`;

ALTER TABLE `mall_user_info`
ADD COLUMN `merchant_id` bigint(20) AFTER `email`;

+ 2
- 2
mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java Просмотреть файл

@@ -1335,8 +1335,8 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService,IExc
WxCUserBasicInfo basicInfo = (WxCUserBasicInfo) params.get("basicInfo");
TenantEntity tenantInfo = (TenantEntity) params.get("tenantInfo");
List<WxCUserBasicInfoVo> list = new ArrayList<WxCUserBasicInfoVo>();
basicInfo.setBegin((page-1)*10000);
basicInfo.setLimit(10000);
basicInfo.setBegin((page-1)*20000);
basicInfo.setLimit(20000);
// if(StringUtils.isNotBlank(tenantInfo.getParentTenantId())){
// //list = wxCUserBasicInfoMapper.findVoList1(tenantInfo,basicInfo);
// }else{


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

@@ -829,7 +829,9 @@

<select id="findVoList1" resultMap="VoBaseResultMap">
select
<include refid="allVoColumns"/>
cu.`id`,cu.`name`,cu.`sex`,cu.`phone`,cu.`nick_name`,cu.`education`,cu.`birthdate`,cu.`address`,
cu.`active_time`,cu.`create_date`,cu.`poins`,cu.`credit`,
cut.`tags`
<!-- ,(select ifnull(sum(credit.credit_num),0) amount from wx_credit_history${basicInfo.shardFinalTableSuffix} credit-->
<!-- where credit.`tenant_id` = #{basicInfo.finalTenantId}-->
<!-- and credit.credit_num &gt; 0 and credit.c_user_id = cu.id-->


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