From 6c2808a52437b24b274b8def22710254a25af08e Mon Sep 17 00:00:00 2001 From: gongbiao Date: Thu, 18 Jul 2019 16:14:09 +0800 Subject: [PATCH] =?UTF-8?q?[=E7=A7=AF=E5=88=86=E5=8F=98=E6=9B=B4=E8=AE=B0?= =?UTF-8?q?=E5=BD=95][=E4=BF=AE=E6=94=B9][B=E7=AB=AF=E5=AE=8C=E7=AB=AF?= =?UTF-8?q?=E4=BC=9A=E5=91=98=E5=8F=8AC=E7=AB=AF=E5=AE=8C=E7=AB=AF?= =?UTF-8?q?=E4=BC=9A=E5=91=98=E4=BF=AE=E6=94=B9=E4=B9=8B=E5=89=8D=E7=9A=84?= =?UTF-8?q?=E6=B8=A0=E9=81=93]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/controller/WxCUserController.java | 10 +++++----- .../com/iformall/controller/WxUserGrantController.java | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCUserController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCUserController.java index 352db27ce..4453fdd5c 100755 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCUserController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCUserController.java @@ -117,7 +117,7 @@ public class WxCUserController extends BaseController { wxCUserBasicInfoService.update(wxCUserBasicInfo); wxScoreRulesService.addScore(EnumScoreType.COMPLETE_INFO, wxCUserBasicInfo); //增加积分 - addCredit(wxCUserBasicInfo,EnumScoreType.COMPLETE_INFO); + addCredit(wxCUserBasicInfo, EnumScoreType.COMPLETE_INFO, wxCUserFromBDto.getUserId()); wxCUserTagsService.triggerAssignTags(EnumAssignTagsTrigger.ASSIGN_TAGS_TRIGGER_IMPORT, wxCUserBasicInfo); //新增来自B端的会员关联数据 wxCUserFromB = new WxCUserFromB(); @@ -178,7 +178,7 @@ public class WxCUserController extends BaseController { wxCUserBasicInfoService.update(wxCUserBasicInfo); wxScoreRulesService.addScore(EnumScoreType.COMPLETE_INFO, wxCUserBasicInfo); //增加积分 - addCredit(wxCUserBasicInfo,EnumScoreType.COMPLETE_INFO); + addCredit(wxCUserBasicInfo, EnumScoreType.COMPLETE_INFO, wxCUserFromBDto.getUserId()); wxCUserTagsService.triggerAssignTags(EnumAssignTagsTrigger.ASSIGN_TAGS_TRIGGER_IMPORT, wxCUserBasicInfo); //更新B端来源会员 wxCUserFromB.setInfo(JSONObject.toJSONString(wxCUserBasicInfo)); @@ -187,14 +187,14 @@ public class WxCUserController extends BaseController { return new ResultData(); } - private void addCredit(WxCUserBasicInfo wxCUserBasicInfo, EnumScoreType enumScoreType) { + private void addCredit(WxCUserBasicInfo wxCUserBasicInfo, EnumScoreType enumScoreType, Long userId) { WxCreditHistory wxCreditHistory = new WxCreditHistory(); wxCreditHistory.setCUserId(wxCUserBasicInfo.getId()); wxCreditHistory.setTenantId(getTenantId()); wxCreditHistory.setCreateDate(new Date()); wxCreditHistory.setCreditType(enumScoreType.getCode()); - wxCreditHistory.setOperatorType(EnumUserType.CUSERBASIC.getCode()); - wxCreditHistory.setOperatorId(wxCUserBasicInfo.getId()); + wxCreditHistory.setOperatorType(EnumUserType.BUSER.getCode()); + wxCreditHistory.setOperatorId(userId); wxCreditHistoryService.saveOrUpdate(wxCreditHistory); } diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java index af4e7541b..fae354d30 100755 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java @@ -781,8 +781,8 @@ public class WxUserGrantController extends BaseController { wxCreditHistory.setTenantId(getTenantId()); wxCreditHistory.setCreateDate(new Date()); wxCreditHistory.setCreditType(EnumScoreType.COMPLETE_INFO.getCode()); - wxCreditHistory.setOperatorType(EnumUserType.CUSERBASIC.getCode()); - wxCreditHistory.setOperatorId(record.getId()); + wxCreditHistory.setOperatorType(EnumUserType.CUSER.getCode()); + wxCreditHistory.setOperatorId(getUserId()); wxCreditHistoryService.saveOrUpdate(wxCreditHistory); wxCUserTagsService.triggerAssignTags(EnumAssignTagsTrigger.ASSIGN_TAGS_TRIGGER_IMPORT, record); }