Browse Source

更新微信会员表,添加乐观锁version版本号,修复按等级获取积分商品

Jacky Wong 5 years ago
parent
commit
ada81875f6

+ 12 - 0
member-services-models/src/main/java/com/liangjian/dataplatform/member/entity/po/secondary/WeixinUserInfo.java

@@ -99,6 +99,10 @@ public class WeixinUserInfo {
     @Column(name = "consignee")
     @Column(name = "consignee")
     private String consignee;
     private String consignee;
 
 
+    @ApiModelProperty("版本号")
+    @Column(name = "version")
+    private Long version = 0L;
+
     public static WeixinUserInfo fromMap(Map<String,Object> map) {
     public static WeixinUserInfo fromMap(Map<String,Object> map) {
         WeixinUserInfo info = new WeixinUserInfo();
         WeixinUserInfo info = new WeixinUserInfo();
         info.subscribe = (Integer) map.get("subscribe");
         info.subscribe = (Integer) map.get("subscribe");
@@ -322,4 +326,12 @@ public class WeixinUserInfo {
     public void setConsignee(String consignee) {
     public void setConsignee(String consignee) {
         this.consignee = consignee;
         this.consignee = consignee;
     }
     }
+
+    public Long getVersion() {
+        return version;
+    }
+
+    public void setVersion(Long version) {
+        this.version = version;
+    }
 }
 }

+ 3 - 1
member-weixin-service/src/main/java/com/liangjian/dataplatform/member/service/impl/MemIngProductService.java

@@ -4,6 +4,7 @@ import com.liangjian.dataplatform.member.dao.secondary.MemIngProductLevelReposit
 import com.liangjian.dataplatform.member.dao.secondary.MemIngProductRepository;
 import com.liangjian.dataplatform.member.dao.secondary.MemIngProductRepository;
 import com.liangjian.dataplatform.member.entity.po.secondary.*;
 import com.liangjian.dataplatform.member.entity.po.secondary.*;
 import com.liangjian.dataplatform.member.entity.po.secondary.WeixinUserInfo;
 import com.liangjian.dataplatform.member.entity.po.secondary.WeixinUserInfo;
+import com.liangjian.dataplatform.member.entity.token.WeixinJwtTokenGetter;
 import com.liangjian.dataplatform.member.service.IMemIngProductService;
 import com.liangjian.dataplatform.member.service.IMemIngProductService;
 import com.liangjian.dataplatform.member.service.IUserGrowthLogService;
 import com.liangjian.dataplatform.member.service.IUserGrowthLogService;
 import com.liangjian.dataplatform.member.service.IUserLevelService;
 import com.liangjian.dataplatform.member.service.IUserLevelService;
@@ -62,7 +63,8 @@ public class MemIngProductService implements IMemIngProductService {
     @Override
     @Override
     public Page<MemIngProduct> queryProductByPhone(String secretPhone,Integer page, Integer size) {
     public Page<MemIngProduct> queryProductByPhone(String secretPhone,Integer page, Integer size) {
         Pageable pageable = PageRequest.of(page,size, Sort.Direction.DESC,"LastModified");
         Pageable pageable = PageRequest.of(page,size, Sort.Direction.DESC,"LastModified");
-        Integer growthBalance = iUserGrowthLogService.getPointBalance(secretPhone);
+//        Integer growthBalance = iUserGrowthLogService.getPointBalance(secretPhone);
+        Integer growthBalance = WeixinJwtTokenGetter.UserInfo.get().getObject().getGrowth();
         Optional<UserLevelUnit> levelUnit = iUserLevelService.getLevelIn(growthBalance);
         Optional<UserLevelUnit> levelUnit = iUserLevelService.getLevelIn(growthBalance);
         if(!levelUnit.isPresent()) {
         if(!levelUnit.isPresent()) {
             //查不到等级信息
             //查不到等级信息