Browse Source

bug

release_toaliyun_real
xhxu 5 years ago
parent
commit
73d88e7a2e
3 changed files with 11 additions and 4 deletions
  1. +5
    -2
      mallinkCApi/src/main/java/com/iformall/controller/BaseController.java
  2. +4
    -0
      mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java
  3. +2
    -2
      mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml

+ 5
- 2
mallinkCApi/src/main/java/com/iformall/controller/BaseController.java View File

@@ -2,6 +2,7 @@ package com.iformall.controller;

import cn.binarywang.wx.miniapp.api.WxMaService;
import com.iformall.common.ErrorCode;
import com.iformall.common.IdWorker;
import com.iformall.domain.po.base.TenantEntity;
import com.iformall.domain.po.WxAppinfo;
import com.iformall.domain.po.WxCUser;
@@ -204,12 +205,14 @@ public class BaseController {
byId.setPhone(userPhone);
byId.setNickName(userName);
byId.setAvatarUrl(avatarUrl);
byId.setSex(sex);
wxCUserBasicInfoService.update(byId);
return null;
}else{
Date cur = new Date();
basicInfo = new WxCUserBasicInfo();
basicInfo.setId(userId);
final IdWorker idWorker = IdWorker.get();
basicInfo.setId(idWorker.nextId());
basicInfo.updateTenantInfo(tenantEntity);
basicInfo.undateFinalTenantId(tenantEntity);
basicInfo.setPhone(userPhone);
@@ -221,7 +224,7 @@ public class BaseController {
basicInfo.setCreateDate(cur);
basicInfo.setUpdateDate(cur);
wxCUserBasicInfoService.save(basicInfo);
return userId;
return basicInfo.getId();
}
}



+ 4
- 0
mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java View File

@@ -665,6 +665,10 @@ public class WxUserGrantController extends BaseController {
}
wxCUserTagsService.triggerAssignTags(EnumAssignTagsTrigger.ASSIGN_TAGS_TRIGGER_PHONE, user);
}
String key = Constant.tokenPrev + user.getOpenId();
if(cUserTokenRedisTemplate.hasKey(key)){
cUserTokenRedisTemplate.delete(key);
}

if(isFirstPhone) {
// 首次授权, 增加成长值及积分


+ 2
- 2
mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml View File

@@ -633,12 +633,12 @@

<select id="findExpiredFreeCouponOrderByValidDate" parameterType="com.iformall.domain.po.WxCouponOrder" resultMap="BaseResultMap">
select <include refid="allColumns" /> from wx_coupon_order
where expired_time >= date_sub(curdate(),interval 360 day) and expired_time &lt; now() and coupon_price = 0 and coupon_order_status = 0
where expired_time >= date_sub(curdate(),interval 360 day) and expired_time &lt; now() and coupon_price = 0 and coupon_order_status in (0, 4)
</select>

<select id="findExpiredCouponOrderByValidDate" parameterType="com.iformall.domain.po.WxCouponOrder" resultMap="BaseResultMap">
select <include refid="allColumns" /> from wx_coupon_order
where expired_time >= date_sub(curdate(),interval 360 day) and expired_time &lt; now() and coupon_price &gt; 0 and coupon_order_status = 0
where expired_time >= date_sub(curdate(),interval 360 day) and expired_time &lt; now() and coupon_price &gt; 0 and coupon_order_status in (0, 4)
</select>




Loading…
Cancel
Save