From 24218822db3130568c45307ce8bd002f1b467517 Mon Sep 17 00:00:00 2001
From: gongbiao <gongbiao>
Date: Sun, 30 Jun 2019 02:17:58 +0800
Subject: [PATCH] =?UTF-8?q?[C=E7=AB=AF][=E4=BF=AE=E6=94=B9][=E6=8E=88?=
 =?UTF-8?q?=E6=9D=83=E6=89=8B=E6=9C=BA=E5=8F=B7=E6=97=B6=E6=8A=8A=E4=BC=9A?=
 =?UTF-8?q?=E5=91=98=E4=B8=AD=E7=9A=84=E7=A7=AF=E5=88=86=E4=B8=8E=E6=88=90?=
 =?UTF-8?q?=E9=95=BF=E5=80=BC=E5=8A=A0=E5=88=B0=E5=BE=AE=E4=BF=A1=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E6=95=B0=E6=8D=AE=E4=B8=AD=E5=8E=BB]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/WxUserGrantController.java     | 22 +++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java
index d2ca98021..c930b2d4e 100755
--- a/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java
+++ b/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java
@@ -14,8 +14,11 @@ import com.iformall.common.ResultData;
 import com.iformall.domain.po.*;
 import com.iformall.domain.vo.WxCUserVo;
 import com.iformall.domain.vo.WxLevelMerchantCVo;
-import com.iformall.enums.*;
-import com.iformall.exception.MallinkException;
+import com.iformall.enums.EnumAssignTagsTrigger;
+import com.iformall.enums.EnumLevelConfigDiscountStatus;
+import com.iformall.enums.EnumScoreType;
+import com.iformall.enums.EnumUserType;
+import com.iformall.mapper.WxCUserBasicInfoMapper;
 import com.iformall.service.*;
 import com.iformall.service.wechat.FmOpenService;
 import com.iformall.utils.Constant;
@@ -89,6 +92,8 @@ public class WxUserGrantController extends BaseController {
     @Autowired
     WxCreditHistoryService wxCreditHistoryService;
 
+    @Autowired
+    WxCUserBasicInfoMapper wxCUserBasicInfoMapper;
     /**
      * 微信消息服务验证
      *
@@ -508,6 +513,19 @@ public class WxUserGrantController extends BaseController {
                 user.setPhone(phoneNoInfo.getPhoneNumber());
                 user.setPurePhone(phoneNoInfo.getPurePhoneNumber());
                 user.setCountryCode(phoneNoInfo.getCountryCode());
+                if (isFirstPhone) {
+                    //检查是否存在会员信息 如果有 赋值积分
+                    WxCUserBasicInfo wxCUserBasicInfoQuery = new WxCUserBasicInfo();
+                    wxCUserBasicInfoQuery.setPhone(user.getPhone());
+                    wxCUserBasicInfoQuery.setTenantId(user.getTenantId());
+                    WxCUserBasicInfo wxCUserBasicInfo = wxCUserBasicInfoMapper.selectOne(wxCUserBasicInfoQuery);
+                    if (wxCUserBasicInfo != null) {
+                        int credit = user.getCredit() == null ? 0 : user.getCredit();
+                        int score = user.getScore() == null ? 0 : user.getScore();
+                        user.setCredit(wxCUserBasicInfo.getCredit() + credit);
+                        user.setScore(wxCUserBasicInfo.getPoins() + score);
+                    }
+                }
                 wxCUserService.saveOrUpdate(user);
 
                 if(isFirstPhone) {