| @@ -7,12 +7,10 @@ import com.iformall.common.IdWorker; | |||||
| import com.iformall.common.Result; | import com.iformall.common.Result; | ||||
| import com.iformall.common.ResultData; | import com.iformall.common.ResultData; | ||||
| import com.iformall.domain.dto.WxCUserFromBDto; | import com.iformall.domain.dto.WxCUserFromBDto; | ||||
| import com.iformall.domain.po.WxCUser; | |||||
| import com.iformall.domain.po.WxCUserBasicInfo; | |||||
| import com.iformall.domain.po.WxCUserFromB; | |||||
| import com.iformall.domain.po.WxMerchantBUser; | |||||
| import com.iformall.domain.po.*; | |||||
| import com.iformall.enums.EnumAssignTagsTrigger; | import com.iformall.enums.EnumAssignTagsTrigger; | ||||
| import com.iformall.enums.EnumScoreType; | import com.iformall.enums.EnumScoreType; | ||||
| import com.iformall.enums.EnumUserType; | |||||
| import com.iformall.service.*; | import com.iformall.service.*; | ||||
| import io.swagger.annotations.Api; | import io.swagger.annotations.Api; | ||||
| import io.swagger.annotations.ApiImplicitParam; | import io.swagger.annotations.ApiImplicitParam; | ||||
| @@ -55,6 +53,9 @@ public class WxCUserController extends BaseController { | |||||
| @Autowired | @Autowired | ||||
| private WxCUserService wxCUserService; | private WxCUserService wxCUserService; | ||||
| @Autowired | |||||
| private WxCreditHistoryService wxCreditHistoryService; | |||||
| /** | /** | ||||
| * 会员更新信息 | * 会员更新信息 | ||||
| @@ -115,6 +116,8 @@ public class WxCUserController extends BaseController { | |||||
| wxCUserBasicInfo.setUpdateDate(new Date()); | wxCUserBasicInfo.setUpdateDate(new Date()); | ||||
| wxCUserBasicInfoService.update(wxCUserBasicInfo); | wxCUserBasicInfoService.update(wxCUserBasicInfo); | ||||
| wxScoreRulesService.addScore(EnumScoreType.COMPLETE_INFO, wxCUserBasicInfo); | wxScoreRulesService.addScore(EnumScoreType.COMPLETE_INFO, wxCUserBasicInfo); | ||||
| //增加积分 | |||||
| addCredit(wxCUserBasicInfo,EnumScoreType.COMPLETE_INFO); | |||||
| wxCUserTagsService.triggerAssignTags(EnumAssignTagsTrigger.ASSIGN_TAGS_TRIGGER_IMPORT, wxCUserBasicInfo); | wxCUserTagsService.triggerAssignTags(EnumAssignTagsTrigger.ASSIGN_TAGS_TRIGGER_IMPORT, wxCUserBasicInfo); | ||||
| //新增来自B端的会员关联数据 | //新增来自B端的会员关联数据 | ||||
| wxCUserFromB = new WxCUserFromB(); | wxCUserFromB = new WxCUserFromB(); | ||||
| @@ -174,6 +177,8 @@ public class WxCUserController extends BaseController { | |||||
| wxCUserBasicInfo.setPhone(wxCUser.getPhone()); | wxCUserBasicInfo.setPhone(wxCUser.getPhone()); | ||||
| wxCUserBasicInfoService.update(wxCUserBasicInfo); | wxCUserBasicInfoService.update(wxCUserBasicInfo); | ||||
| wxScoreRulesService.addScore(EnumScoreType.COMPLETE_INFO, wxCUserBasicInfo); | wxScoreRulesService.addScore(EnumScoreType.COMPLETE_INFO, wxCUserBasicInfo); | ||||
| //增加积分 | |||||
| addCredit(wxCUserBasicInfo,EnumScoreType.COMPLETE_INFO); | |||||
| wxCUserTagsService.triggerAssignTags(EnumAssignTagsTrigger.ASSIGN_TAGS_TRIGGER_IMPORT, wxCUserBasicInfo); | wxCUserTagsService.triggerAssignTags(EnumAssignTagsTrigger.ASSIGN_TAGS_TRIGGER_IMPORT, wxCUserBasicInfo); | ||||
| //更新B端来源会员 | //更新B端来源会员 | ||||
| wxCUserFromB.setInfo(JSONObject.toJSONString(wxCUserBasicInfo)); | wxCUserFromB.setInfo(JSONObject.toJSONString(wxCUserBasicInfo)); | ||||
| @@ -182,6 +187,17 @@ public class WxCUserController extends BaseController { | |||||
| return new ResultData(); | return new ResultData(); | ||||
| } | } | ||||
| private void addCredit(WxCUserBasicInfo wxCUserBasicInfo, EnumScoreType enumScoreType) { | |||||
| 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()); | |||||
| wxCreditHistoryService.saveOrUpdate(wxCreditHistory); | |||||
| } | |||||
| /** | /** | ||||
| * 会员信息 | * 会员信息 | ||||
| @@ -60,6 +60,9 @@ public class WxCarController extends BaseController { | |||||
| @Autowired | @Autowired | ||||
| WxCarCmdLogService wxCarCmdLogService; | WxCarCmdLogService wxCarCmdLogService; | ||||
| @Autowired | |||||
| WxCreditHistoryService wxCreditHistoryService; | |||||
| private WxPark getCurrentPark(String tenantId) { | private WxPark getCurrentPark(String tenantId) { | ||||
| WxPark parkQ = new WxPark(); | WxPark parkQ = new WxPark(); | ||||
| parkQ.setTenantId(tenantId); | parkQ.setTenantId(tenantId); | ||||
| @@ -288,6 +291,8 @@ public class WxCarController extends BaseController { | |||||
| wxCUserCarService.saveOrUpdate(userCar); | wxCUserCarService.saveOrUpdate(userCar); | ||||
| wxScoreRulesService.addScore(EnumScoreType.BIND_CAR,userCar); | wxScoreRulesService.addScore(EnumScoreType.BIND_CAR,userCar); | ||||
| //增加积分 | |||||
| addCredit(); | |||||
| JSONObject dataObj = retObj.getJSONObject("data"); | JSONObject dataObj = retObj.getJSONObject("data"); | ||||
| wxCUserTagsService.triggerAssignTags(EnumAssignTagsTrigger.ASSIGN_TAGS_TRIGGER_CAR,getUserId()); | wxCUserTagsService.triggerAssignTags(EnumAssignTagsTrigger.ASSIGN_TAGS_TRIGGER_CAR,getUserId()); | ||||
| return new ResultData(dataObj); | return new ResultData(dataObj); | ||||
| @@ -343,6 +348,8 @@ public class WxCarController extends BaseController { | |||||
| try { | try { | ||||
| wxCUserCarService.save(userCar); | wxCUserCarService.save(userCar); | ||||
| wxScoreRulesService.addScore(EnumScoreType.BIND_CAR,userCar); | wxScoreRulesService.addScore(EnumScoreType.BIND_CAR,userCar); | ||||
| //增加积分 | |||||
| addCredit(); | |||||
| } catch (Exception e) { | } catch (Exception e) { | ||||
| logger.error(e.getMessage()); | logger.error(e.getMessage()); | ||||
| return new ResultData(ErrorCode.DB_FAIL.getCode(), "TJD保存车牌失败, e:" + e.getMessage()); | return new ResultData(ErrorCode.DB_FAIL.getCode(), "TJD保存车牌失败, e:" + e.getMessage()); | ||||
| @@ -357,6 +364,18 @@ public class WxCarController extends BaseController { | |||||
| return new ResultData(ErrorCode.CAR_VENDOR_NOT_SUPPORT.getCode(), "绑车牌失败"); | return new ResultData(ErrorCode.CAR_VENDOR_NOT_SUPPORT.getCode(), "绑车牌失败"); | ||||
| } | } | ||||
| //-----增加积分start----- | |||||
| private void addCredit(){ | |||||
| WxCreditHistory wxCreditHistory = new WxCreditHistory(); | |||||
| wxCreditHistory.setCUserId(getUserId()); | |||||
| wxCreditHistory.setTenantId(getTenantId()); | |||||
| wxCreditHistory.setCreateDate(new Date()); | |||||
| wxCreditHistory.setCreditType(EnumScoreType.BIND_CAR.getCode()); | |||||
| wxCreditHistory.setOperatorType(EnumUserType.CUSER.getCode()); | |||||
| wxCreditHistory.setOperatorId(getUserId()); | |||||
| wxCreditHistoryService.saveOrUpdate(wxCreditHistory); | |||||
| } | |||||
| /** | /** | ||||
| * 解绑车牌 | * 解绑车牌 | ||||
| * @param paramMap | * @param paramMap | ||||
| @@ -14,10 +14,7 @@ import com.iformall.common.ResultData; | |||||
| import com.iformall.domain.po.*; | import com.iformall.domain.po.*; | ||||
| import com.iformall.domain.vo.WxCUserVo; | import com.iformall.domain.vo.WxCUserVo; | ||||
| import com.iformall.domain.vo.WxLevelMerchantCVo; | import com.iformall.domain.vo.WxLevelMerchantCVo; | ||||
| import com.iformall.enums.EnumAssignTagsTrigger; | |||||
| import com.iformall.enums.EnumCouponOrderStatus; | |||||
| import com.iformall.enums.EnumLevelConfigDiscountStatus; | |||||
| import com.iformall.enums.EnumScoreType; | |||||
| import com.iformall.enums.*; | |||||
| import com.iformall.service.*; | import com.iformall.service.*; | ||||
| import com.iformall.service.wechat.FmOpenService; | import com.iformall.service.wechat.FmOpenService; | ||||
| import com.iformall.utils.Constant; | import com.iformall.utils.Constant; | ||||
| @@ -88,6 +85,9 @@ public class WxUserGrantController extends BaseController { | |||||
| @Autowired | @Autowired | ||||
| WxCouponOrderService wxCouponOrderService; | WxCouponOrderService wxCouponOrderService; | ||||
| @Autowired | |||||
| WxCreditHistoryService wxCreditHistoryService; | |||||
| /** | /** | ||||
| * 用户登录 | * 用户登录 | ||||
| * @param map | * @param map | ||||
| @@ -180,6 +180,7 @@ public class WxUserGrantController extends BaseController { | |||||
| user.setUnionId(unionId); | user.setUnionId(unionId); | ||||
| } | } | ||||
| int score = 0; | int score = 0; | ||||
| int credit = 0; | |||||
| try { | try { | ||||
| WxCUser user1 = wxCUserService.getByOpenId(user); | WxCUser user1 = wxCUserService.getByOpenId(user); | ||||
| boolean bFoundByUnionId = false; | boolean bFoundByUnionId = false; | ||||
| @@ -229,6 +230,8 @@ public class WxUserGrantController extends BaseController { | |||||
| // 成长值 | // 成长值 | ||||
| try { | try { | ||||
| score = wxScoreRulesService.addScore(EnumScoreType.LOGIN, user1); | score = wxScoreRulesService.addScore(EnumScoreType.LOGIN, user1); | ||||
| //-----增加积分start----- | |||||
| credit = addCredit(user1,EnumScoreType.LOGIN).getCreditNum(); | |||||
| } catch (Exception e) { | } catch (Exception e) { | ||||
| logger.error("c_user score " + e.getMessage()); | logger.error("c_user score " + e.getMessage()); | ||||
| } | } | ||||
| @@ -262,6 +265,9 @@ public class WxUserGrantController extends BaseController { | |||||
| try { | try { | ||||
| score = wxScoreRulesService.addScore(EnumScoreType.LOGIN, user); | score = wxScoreRulesService.addScore(EnumScoreType.LOGIN, user); | ||||
| //-----增加积分start----- | |||||
| credit = addCredit(user1,EnumScoreType.LOGIN).getCreditNum(); | |||||
| } catch (Exception e) { | } catch (Exception e) { | ||||
| logger.error(e.getMessage()); | logger.error(e.getMessage()); | ||||
| } | } | ||||
| @@ -275,6 +281,7 @@ public class WxUserGrantController extends BaseController { | |||||
| resultMap.put("score",score); | resultMap.put("score",score); | ||||
| resultMap.put("credit",credit); | |||||
| return new ResultData(resultMap); | return new ResultData(resultMap); | ||||
| } | } | ||||
| @@ -341,6 +348,8 @@ public class WxUserGrantController extends BaseController { | |||||
| // 成长值 | // 成长值 | ||||
| wxScoreRulesService.addScore(EnumScoreType.WECHAT_PERSION,user); | wxScoreRulesService.addScore(EnumScoreType.WECHAT_PERSION,user); | ||||
| //增加积分 | |||||
| addCredit(user,EnumScoreType.WECHAT_PERSION); | |||||
| resultMap.put("openId", user.getOpenId()); | resultMap.put("openId", user.getOpenId()); | ||||
| resultMap.put("unionId", user.getUnionId()); | resultMap.put("unionId", user.getUnionId()); | ||||
| @@ -396,6 +405,8 @@ public class WxUserGrantController extends BaseController { | |||||
| // 成长值 | // 成长值 | ||||
| wxScoreRulesService.addScore(EnumScoreType.WECHAT_PHONE,user); | wxScoreRulesService.addScore(EnumScoreType.WECHAT_PHONE,user); | ||||
| //增加积分 | |||||
| addCredit(user,EnumScoreType.WECHAT_PHONE); | |||||
| resultMap.put("msg","授权手机成功!"); | resultMap.put("msg","授权手机成功!"); | ||||
| resultMap.put("phone",phoneNoInfo.getPhoneNumber()); | resultMap.put("phone",phoneNoInfo.getPhoneNumber()); | ||||
| @@ -615,6 +626,15 @@ public class WxUserGrantController extends BaseController { | |||||
| record.setUpdateDate(new Date()); | record.setUpdateDate(new Date()); | ||||
| wxCUserBasicInfoService.update(record); | wxCUserBasicInfoService.update(record); | ||||
| wxScoreRulesService.addScore(EnumScoreType.COMPLETE_INFO, record); | wxScoreRulesService.addScore(EnumScoreType.COMPLETE_INFO, record); | ||||
| //增加积分 | |||||
| WxCreditHistory wxCreditHistory = new WxCreditHistory(); | |||||
| wxCreditHistory.setCUserId(record.getId()); | |||||
| wxCreditHistory.setTenantId(getTenantId()); | |||||
| wxCreditHistory.setCreateDate(new Date()); | |||||
| wxCreditHistory.setCreditType(EnumScoreType.COMPLETE_INFO.getCode()); | |||||
| wxCreditHistory.setOperatorType(EnumUserType.CUSERBASIC.getCode()); | |||||
| wxCreditHistory.setOperatorId(record.getId()); | |||||
| wxCreditHistoryService.saveOrUpdate(wxCreditHistory); | |||||
| wxCUserTagsService.triggerAssignTags(EnumAssignTagsTrigger.ASSIGN_TAGS_TRIGGER_IMPORT, record); | wxCUserTagsService.triggerAssignTags(EnumAssignTagsTrigger.ASSIGN_TAGS_TRIGGER_IMPORT, record); | ||||
| } | } | ||||
| return new ResultData(); | return new ResultData(); | ||||
| @@ -651,4 +671,16 @@ public class WxUserGrantController extends BaseController { | |||||
| return new ResultData(result); | return new ResultData(result); | ||||
| } | } | ||||
| private WxCreditHistory addCredit(WxCUser wxCUser, EnumScoreType enumScoreType) { | |||||
| WxCreditHistory wxCreditHistory = new WxCreditHistory(); | |||||
| wxCreditHistory.setCUserId(wxCUser.getId()); | |||||
| wxCreditHistory.setTenantId(getTenantId()); | |||||
| wxCreditHistory.setCreateDate(new Date()); | |||||
| wxCreditHistory.setCreditType(enumScoreType.getCode()); | |||||
| wxCreditHistory.setOperatorType(EnumUserType.CUSER.getCode()); | |||||
| wxCreditHistory.setOperatorId(wxCUser.getId()); | |||||
| ResultData resultData = wxCreditHistoryService.saveOrUpdate(wxCreditHistory); | |||||
| return (WxCreditHistory) resultData.data; | |||||
| } | |||||
| } | } | ||||