| @@ -204,7 +204,7 @@ public class WxCUserBasicInfoController extends BaseController { | |||||
| wxCUserBasicInfo.setFinalTenantId(tenantEntity.getFinalTenantId()); | wxCUserBasicInfo.setFinalTenantId(tenantEntity.getFinalTenantId()); | ||||
| wxCUserBasicInfoService.update(wxCUserBasicInfo); | wxCUserBasicInfoService.update(wxCUserBasicInfo); | ||||
| wxCUserBasicInfo.updateTenantInfo(oldInfo); | wxCUserBasicInfo.updateTenantInfo(oldInfo); | ||||
| wxCUserTagsService.triggerAssignTags(EnumAssignTagsTrigger.ASSIGN_TAGS_TRIGGER_IMPORT, wxCUserBasicInfo); | |||||
| wxCUserTagsService.triggerAssignTags(EnumAssignTagsTrigger.ASSIGN_TAGS_TRIGGER_IMPORT, wxCUserBasicInfo,tenantEntity); | |||||
| return new ResultData(); | return new ResultData(); | ||||
| } | } | ||||
| @@ -120,7 +120,7 @@ public class WxCUserController extends BaseController { | |||||
| wxScoreRulesService.addScore(getTenantInfo(),EnumScoreType.COMPLETE_INFO, wxCUserBasicInfo); | wxScoreRulesService.addScore(getTenantInfo(),EnumScoreType.COMPLETE_INFO, wxCUserBasicInfo); | ||||
| //增加积分 | //增加积分 | ||||
| addCredit(wxCUserBasicInfo, EnumScoreType.COMPLETE_INFO, wxCUserFromBDto.getUserId(), wxCUserFromB); | addCredit(wxCUserBasicInfo, EnumScoreType.COMPLETE_INFO, wxCUserFromBDto.getUserId(), wxCUserFromB); | ||||
| wxCUserTagsService.triggerAssignTags(EnumAssignTagsTrigger.ASSIGN_TAGS_TRIGGER_IMPORT, wxCUserBasicInfo); | |||||
| wxCUserTagsService.triggerAssignTags(EnumAssignTagsTrigger.ASSIGN_TAGS_TRIGGER_IMPORT, wxCUserBasicInfo,bUser); | |||||
| //新增来自B端的会员关联数据 | //新增来自B端的会员关联数据 | ||||
| wxCUserFromB = new WxCUserFromB(); | wxCUserFromB = new WxCUserFromB(); | ||||
| wxCUserFromB.setBUserId(wxCUserFromBDto.getUserId()); | wxCUserFromB.setBUserId(wxCUserFromBDto.getUserId()); | ||||
| @@ -181,7 +181,7 @@ public class WxCUserController extends BaseController { | |||||
| wxScoreRulesService.addScore(getTenantInfo(),EnumScoreType.COMPLETE_INFO, wxCUserBasicInfo); | wxScoreRulesService.addScore(getTenantInfo(),EnumScoreType.COMPLETE_INFO, wxCUserBasicInfo); | ||||
| //增加积分 | //增加积分 | ||||
| addCredit(wxCUserBasicInfo, EnumScoreType.COMPLETE_INFO, wxCUserFromBDto.getUserId(), wxCUserFromB); | addCredit(wxCUserBasicInfo, EnumScoreType.COMPLETE_INFO, wxCUserFromBDto.getUserId(), wxCUserFromB); | ||||
| wxCUserTagsService.triggerAssignTags(EnumAssignTagsTrigger.ASSIGN_TAGS_TRIGGER_IMPORT, wxCUserBasicInfo); | |||||
| wxCUserTagsService.triggerAssignTags(EnumAssignTagsTrigger.ASSIGN_TAGS_TRIGGER_IMPORT, wxCUserBasicInfo,bUser); | |||||
| //更新B端来源会员 | //更新B端来源会员 | ||||
| wxCUserFromB.setInfo(JSONObject.toJSONString(wxCUserBasicInfo)); | wxCUserFromB.setInfo(JSONObject.toJSONString(wxCUserBasicInfo)); | ||||
| wxCUserFromBService.saveOrUpdate(wxCUserFromB); | wxCUserFromBService.saveOrUpdate(wxCUserFromB); | ||||
| @@ -89,7 +89,7 @@ public class WxMsgValidationcodeController extends BaseController { | |||||
| wxCUserService.saveOrUpdate(user); | wxCUserService.saveOrUpdate(user); | ||||
| wxCUserService.delForUserIdOnly(user.getId(),user.getUserId(),user.getTenantId()); | wxCUserService.delForUserIdOnly(user.getId(),user.getUserId(),user.getTenantId()); | ||||
| // wxCUserService.assureUserIdOnly(user.getId(),); | // wxCUserService.assureUserIdOnly(user.getId(),); | ||||
| wxCUserTagsService.triggerAssignTags(EnumAssignTagsTrigger.ASSIGN_TAGS_TRIGGER_PHONE,user); | |||||
| wxCUserTagsService.triggerAssignTags(EnumAssignTagsTrigger.ASSIGN_TAGS_TRIGGER_PHONE,user,wxMsgValidationcode); | |||||
| cUserTokenService.removeTokenCache(user.getToken()); | cUserTokenService.removeTokenCache(user.getToken()); | ||||
| } | } | ||||
| @@ -687,7 +687,7 @@ public class WxUserGrantController extends BaseController { | |||||
| } | } | ||||
| wxCUserService.saveOrUpdate(user); | wxCUserService.saveOrUpdate(user); | ||||
| wxCUserService.delForUserIdOnly(user.getId(),user.getUserId(),user.getTenantId()); | wxCUserService.delForUserIdOnly(user.getId(),user.getUserId(),user.getTenantId()); | ||||
| wxCUserTagsService.triggerAssignTags(EnumAssignTagsTrigger.ASSIGN_TAGS_TRIGGER_PHONE, user); | |||||
| wxCUserTagsService.triggerAssignTags(EnumAssignTagsTrigger.ASSIGN_TAGS_TRIGGER_PHONE, user,user); | |||||
| } | } | ||||
| removeCacheCUser(); | removeCacheCUser(); | ||||
| @@ -976,7 +976,7 @@ public class WxUserGrantController extends BaseController { | |||||
| wxCreditHistory.setOperatorType(EnumUserType.CUSER.getCode()); | wxCreditHistory.setOperatorType(EnumUserType.CUSER.getCode()); | ||||
| wxCreditHistory.setOperatorId(memberId); | wxCreditHistory.setOperatorId(memberId); | ||||
| wxCreditHistoryService.saveOrUpdate(wxCreditHistory); | wxCreditHistoryService.saveOrUpdate(wxCreditHistory); | ||||
| wxCUserTagsService.triggerAssignTags(EnumAssignTagsTrigger.ASSIGN_TAGS_TRIGGER_IMPORT, record); | |||||
| wxCUserTagsService.triggerAssignTags(EnumAssignTagsTrigger.ASSIGN_TAGS_TRIGGER_IMPORT, record,tenantEntity); | |||||
| } | } | ||||
| return new ResultData(); | return new ResultData(); | ||||
| } | } | ||||
| @@ -1,4 +1,4 @@ | |||||
| package com.iformall.controller.callback; | |||||
| package com.iformall.controller.callback.car; | |||||
| import com.alibaba.fastjson.JSON; | import com.alibaba.fastjson.JSON; | ||||
| import com.alibaba.fastjson.JSONObject; | import com.alibaba.fastjson.JSONObject; | ||||
| @@ -1,4 +1,4 @@ | |||||
| package com.iformall.controller.callback; | |||||
| package com.iformall.controller.callback.car; | |||||
| import com.alibaba.fastjson.JSON; | import com.alibaba.fastjson.JSON; | ||||
| import com.github.pagehelper.PageInfo; | import com.github.pagehelper.PageInfo; | ||||
| @@ -1,4 +1,4 @@ | |||||
| package com.iformall.controller.callback; | |||||
| package com.iformall.controller.callback.car; | |||||
| import com.alibaba.fastjson.JSON; | import com.alibaba.fastjson.JSON; | ||||
| import com.github.pagehelper.PageInfo; | import com.github.pagehelper.PageInfo; | ||||
| @@ -1,4 +1,4 @@ | |||||
| package com.iformall.controller.callback; | |||||
| package com.iformall.controller.callback.car; | |||||
| import com.alibaba.fastjson.JSON; | import com.alibaba.fastjson.JSON; | ||||
| import com.github.pagehelper.PageInfo; | import com.github.pagehelper.PageInfo; | ||||
| @@ -1,11 +1,11 @@ | |||||
| package com.iformall.controller.callback.cyf; | |||||
| package com.iformall.controller.callback.car.cyf; | |||||
| import com.alibaba.fastjson.JSON; | import com.alibaba.fastjson.JSON; | ||||
| import com.alibaba.fastjson.JSONObject; | import com.alibaba.fastjson.JSONObject; | ||||
| import com.github.pagehelper.PageInfo; | import com.github.pagehelper.PageInfo; | ||||
| import com.iformall.common.Result; | import com.iformall.common.Result; | ||||
| import com.iformall.controller.base.BaseController; | import com.iformall.controller.base.BaseController; | ||||
| import com.iformall.controller.callback.WxParkCallBackBaseController; | |||||
| import com.iformall.controller.callback.car.WxParkCallBackBaseController; | |||||
| import com.iformall.domain.po.*; | import com.iformall.domain.po.*; | ||||
| import com.iformall.domain.vo.WxCarCYFVo; | import com.iformall.domain.vo.WxCarCYFVo; | ||||
| import com.iformall.enums.EnumCarCmd; | import com.iformall.enums.EnumCarCmd; | ||||
| @@ -0,0 +1,107 @@ | |||||
| package com.iformall.controller.callback.car.jieshun; | |||||
| import com.alibaba.fastjson.JSON; | |||||
| import com.alibaba.fastjson.JSONObject; | |||||
| import com.github.pagehelper.PageInfo; | |||||
| import com.iformall.common.Result; | |||||
| import com.iformall.controller.base.BaseController; | |||||
| import com.iformall.controller.callback.car.WxParkCallBackBaseController; | |||||
| import com.iformall.domain.po.*; | |||||
| import com.iformall.domain.vo.WxCarCYFVo; | |||||
| import com.iformall.enums.EnumCarCmd; | |||||
| import com.iformall.enums.EnumCarVendor; | |||||
| import com.iformall.enums.EnumCouponSendSendType; | |||||
| import com.iformall.enums.EnumPayWay; | |||||
| import com.iformall.service.*; | |||||
| import com.iformall.utils.car.CYFUtil; | |||||
| import com.iformall.utils.car.TJDUtil; | |||||
| import lombok.extern.slf4j.Slf4j; | |||||
| import org.apache.commons.collections.CollectionUtils; | |||||
| import org.apache.commons.lang3.StringUtils; | |||||
| import org.springframework.beans.factory.annotation.Autowired; | |||||
| import org.springframework.web.bind.annotation.PostMapping; | |||||
| import org.springframework.web.bind.annotation.RequestBody; | |||||
| import org.springframework.web.bind.annotation.RequestMapping; | |||||
| import org.springframework.web.bind.annotation.RestController; | |||||
| import java.util.Date; | |||||
| import java.util.HashMap; | |||||
| import java.util.List; | |||||
| import java.util.Map; | |||||
| /** | |||||
| * @author: furunxin | |||||
| * @Date: 2020/7/6 15:29 | |||||
| * @Description: 车易付回调接口 | |||||
| */ | |||||
| @Slf4j | |||||
| @RestController | |||||
| @RequestMapping("/jieshunCarCallback") | |||||
| public class WxCarJieShunCallBackController extends WxParkCallBackBaseController { | |||||
| @Autowired | |||||
| WxParkService wxParkService; | |||||
| @Autowired | |||||
| WxCarCmdLogService wxCarCmdLogService; | |||||
| @Autowired | |||||
| WxCUserService wxCUserService; | |||||
| @Autowired | |||||
| WxCUserCarService wxCUserCarService; | |||||
| @Autowired | |||||
| WxCouponSendService wxCouponSendService; | |||||
| @Autowired | |||||
| WxCarPayRecordService wxCarPayRecordService; | |||||
| @Autowired | |||||
| WxCUserBasicInfoService wxCUserBasicInfoService; | |||||
| /** | |||||
| * @description 车易付 车辆入场通知 | |||||
| * @Params [paramMap] | |||||
| * @return com.iformall.common.Result | |||||
| * @Author furunxin | |||||
| * @Date 2020/7/8 上午8:27 | |||||
| **/ | |||||
| @PostMapping(value = "/cyfParkInCallback") | |||||
| public Result cyfParkInCallback(@RequestBody Map<String, Object> paramMap) { | |||||
| log.info("["+getIpAddr()+"] cyfParkInCallback: " + paramMap.toString()); | |||||
| //解析车易付参数 | |||||
| return super.parkInCallBack(EnumCarVendor.CAE_CYF, EnumCarCmd.CAR_CYF_CALLBACK_PARK_IN, paramMap); | |||||
| } | |||||
| /** | |||||
| * @description 车易付 车辆离场通知 | |||||
| * @Params [param] | |||||
| * @return java.util.Map | |||||
| * @Author furunxin | |||||
| * @Date 2020/7/12 上午9:00 | |||||
| **/ | |||||
| @PostMapping(value = "/cyfParkOutCallback") | |||||
| public Result cyfParkOutCallback(@RequestBody WxCarCYFVo param) { | |||||
| String requestJson = JSONObject.toJSONString(param); | |||||
| log.info("["+getIpAddr()+"cyfParkOutCallback: " + requestJson); | |||||
| return super.parkOutCallBack(EnumCarVendor.CAE_CYF, EnumCarCmd.CAR_CYF_CALLBACK_PARK_OUT, param); | |||||
| } | |||||
| @PostMapping(value = "/cyfUnbindCallback") | |||||
| public Result cyfUnbindCallback(@RequestBody Map<String, Object> paramMap) { | |||||
| log.info("["+getIpAddr()+"] cyfParkInCallback: " + paramMap.toString()); | |||||
| //解析车易付参数 | |||||
| return super.unbindCarCallBack(EnumCarVendor.CAE_CYF, EnumCarCmd.CAR_CYF_CALLBACK_UNBIND, paramMap); | |||||
| } | |||||
| @PostMapping(value = "/cyfPaidCallback") | |||||
| public Result cyfPaidCallback(@RequestBody Map<String, Object> paramMap) { | |||||
| log.info("["+getIpAddr()+"] cyfParkInCallback: " + paramMap.toString()); | |||||
| //解析车易付参数 | |||||
| return super.paidCallback(EnumCarVendor.CAE_CYF, EnumCarCmd.CAR_CYF_CALLBACK_PAID, paramMap); | |||||
| } | |||||
| } | |||||
| @@ -63,7 +63,7 @@ public class WxCUserTagsSchedule { | |||||
| page = wxCUserBasicInfoService.listAsPage(wxCUserBasicInfo, pageIndex++, pageSize); | page = wxCUserBasicInfoService.listAsPage(wxCUserBasicInfo, pageIndex++, pageSize); | ||||
| page.getList().stream().forEach(cubi -> { | page.getList().stream().forEach(cubi -> { | ||||
| try { | try { | ||||
| wxCUserTagsService.triggerAssignTags(EnumAssignTagsTrigger.ASSIGN_TAGS_TRIGGER_SCAN, new WxCUserBasicTagVo((WxCUserBasicInfo)cubi,mall.getTenantId())); | |||||
| wxCUserTagsService.triggerAssignTags(EnumAssignTagsTrigger.ASSIGN_TAGS_TRIGGER_SCAN, new WxCUserBasicTagVo((WxCUserBasicInfo)cubi,mall.getTenantId()),mall); | |||||
| }catch(Exception e) { | }catch(Exception e) { | ||||
| logger.error("wxCUserTagsSchedule error."+cubi.toString(),e); | logger.error("wxCUserTagsSchedule error."+cubi.toString(),e); | ||||
| } | } | ||||
| @@ -13,6 +13,7 @@ public enum EnumCarVendor { | |||||
| CAR_SHANGAN(4, "ShangAn"), | CAR_SHANGAN(4, "ShangAn"), | ||||
| CAR_BOLINK(5, "BoLink"), | CAR_BOLINK(5, "BoLink"), | ||||
| CAE_CYF(6,"CYF"), | CAE_CYF(6,"CYF"), | ||||
| CAR_JIESHUN(7,"JIESHUN") | |||||
| ; | ; | ||||
| public static EnumCarVendor getEnum(Integer code) { | public static EnumCarVendor getEnum(Integer code) { | ||||
| @@ -48,7 +48,7 @@ public interface WxCUserTagsService { | |||||
| List<WxTags> assignTags(List<Long> tagIdList,WxCUserBasicInfo user); | List<WxTags> assignTags(List<Long> tagIdList,WxCUserBasicInfo user); | ||||
| List<WxTags> triggerAssignTags(EnumAssignTagsTrigger trigger, Object obj); | |||||
| List<WxTags> triggerAssignTags(EnumAssignTagsTrigger trigger, Object obj,TenantEntity tenantEntity); | |||||
| void updateTagByUserId(Long cUserId,TenantEntity tenantinfo, List<Long> tags); | void updateTagByUserId(Long cUserId,TenantEntity tenantinfo, List<Long> tags); | ||||
| @@ -304,7 +304,7 @@ public class WxCUserServiceImpl implements WxCUserService { | |||||
| cUser.setTenantId(user.getTenantId()); | cUser.setTenantId(user.getTenantId()); | ||||
| saveOrUpdate(cUser); | saveOrUpdate(cUser); | ||||
| } | } | ||||
| wxCUserTagsService.triggerAssignTags(EnumAssignTagsTrigger.ASSIGN_TAGS_TRIGGER_LOGIN, wxCUser); | |||||
| wxCUserTagsService.triggerAssignTags(EnumAssignTagsTrigger.ASSIGN_TAGS_TRIGGER_LOGIN, wxCUser,user); | |||||
| } | } | ||||
| // 用户从unionId来的,可能会有重复 | // 用户从unionId来的,可能会有重复 | ||||
| // if(findByUnionId != null) { | // if(findByUnionId != null) { | ||||
| @@ -351,7 +351,7 @@ public class WxCUserTagsServiceImpl implements WxCUserTagsService { | |||||
| } | } | ||||
| private List<WxTags> assignTypeId14(WxCUserBasicInfo user) | |||||
| private List<WxTags> assignTypeId14(WxCUserBasicInfo user,TenantEntity tenantEntity) | |||||
| { | { | ||||
| List<WxTags> resList = null; | List<WxTags> resList = null; | ||||
| Calendar endC = Calendar.getInstance(); | Calendar endC = Calendar.getInstance(); | ||||
| @@ -364,12 +364,14 @@ public class WxCUserTagsServiceImpl implements WxCUserTagsService { | |||||
| wxCouponOrder.setCouponOrderStatus(EnumCouponOrderStatus.COUPON_ORDER_USED.getCode()); | wxCouponOrder.setCouponOrderStatus(EnumCouponOrderStatus.COUPON_ORDER_USED.getCode()); | ||||
| wxCouponOrder.setStartTime(startC.getTime()); | wxCouponOrder.setStartTime(startC.getTime()); | ||||
| wxCouponOrder.setEndTime(endC.getTime()); | wxCouponOrder.setEndTime(endC.getTime()); | ||||
| wxCouponOrder.updateTenantInfo(tenantEntity); | |||||
| WxCardSpend wxCardSpend = new WxCardSpend(); | WxCardSpend wxCardSpend = new WxCardSpend(); | ||||
| wxCardSpend.setOwnerId(user.getId()); | wxCardSpend.setOwnerId(user.getId()); | ||||
| wxCardSpend.setStartdate(startC.getTime()); | wxCardSpend.setStartdate(startC.getTime()); | ||||
| wxCardSpend.setEnddate(endC.getTime()); | wxCardSpend.setEnddate(endC.getTime()); | ||||
| wxCardSpend.updateTenantInfo(tenantEntity); | |||||
| WxBusiness business = new WxBusiness(); | WxBusiness business = new WxBusiness(); | ||||
| List<WxBusiness> list = wxBusinessMapper.findList(business); | List<WxBusiness> list = wxBusinessMapper.findList(business); | ||||
| @@ -603,7 +605,7 @@ public class WxCUserTagsServiceImpl implements WxCUserTagsService { | |||||
| //打标触发 | //打标触发 | ||||
| @Override | @Override | ||||
| public List<WxTags> triggerAssignTags(EnumAssignTagsTrigger trigger, Object obj) { | |||||
| public List<WxTags> triggerAssignTags(EnumAssignTagsTrigger trigger, Object obj,TenantEntity tenantEntity) { | |||||
| if (obj == null) | if (obj == null) | ||||
| return null; | return null; | ||||
| @@ -665,7 +667,7 @@ public class WxCUserTagsServiceImpl implements WxCUserTagsService { | |||||
| WxCUserBasicInfo user = (WxCUserBasicInfo) obj; | WxCUserBasicInfo user = (WxCUserBasicInfo) obj; | ||||
| if (user != null) { | if (user != null) { | ||||
| //消费类别 | //消费类别 | ||||
| resList = assignTypeId14(user); | |||||
| resList = assignTypeId14(user,tenantEntity); | |||||
| //饮食偏好 | //饮食偏好 | ||||
| resList = assignTypeId17(user); | resList = assignTypeId17(user); | ||||
| //消费时段 | //消费时段 | ||||
| @@ -730,7 +732,7 @@ public class WxCUserTagsServiceImpl implements WxCUserTagsService { | |||||
| } | } | ||||
| //消费类别 | //消费类别 | ||||
| resList = assignTypeId14(user); | |||||
| resList = assignTypeId14(user,tenantEntity); | |||||
| //饮食偏好 | //饮食偏好 | ||||
| resList = assignTypeId17(user); | resList = assignTypeId17(user); | ||||
| @@ -756,7 +758,7 @@ public class WxCUserTagsServiceImpl implements WxCUserTagsService { | |||||
| } | } | ||||
| }catch (Exception e) { | }catch (Exception e) { | ||||
| logger.error("triggerAssignTags Failed:" + trigger.getMessage() + e.getMessage()); | |||||
| logger.error("triggerAssignTags Failed:" + trigger.getMessage() + e.getMessage(),e); | |||||
| } | } | ||||
| return resList; | return resList; | ||||
| @@ -676,6 +676,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { | |||||
| merchantSubsidyQ.setCouponOrderId(couponOrder.getId()); | merchantSubsidyQ.setCouponOrderId(couponOrder.getId()); | ||||
| merchantSubsidyQ.setCouponType(couponOrder.getCouponType()); | merchantSubsidyQ.setCouponType(couponOrder.getCouponType()); | ||||
| merchantSubsidyQ.setType(EnumMerchantSubsidyType.MANUAL.getCode()); | merchantSubsidyQ.setType(EnumMerchantSubsidyType.MANUAL.getCode()); | ||||
| merchantSubsidyQ.updateTenantInfo(couponOrder); | |||||
| List<WxMerchantSubsidy> msList = wxMerchantSubsidyMapper.selectList(new QueryWrapper<WxMerchantSubsidy>(merchantSubsidyQ)); | List<WxMerchantSubsidy> msList = wxMerchantSubsidyMapper.selectList(new QueryWrapper<WxMerchantSubsidy>(merchantSubsidyQ)); | ||||
| if (msList.size() > 0) { | if (msList.size() > 0) { | ||||
| // 补贴已入库 | // 补贴已入库 | ||||
| @@ -1347,6 +1347,7 @@ public class WxOrderServiceImpl implements WxOrderService { | |||||
| WxOrder updateT = new WxOrder(); | WxOrder updateT = new WxOrder(); | ||||
| updateT.setId(updateOrder.getId()); | updateT.setId(updateOrder.getId()); | ||||
| updateT.setPaymentTime(currentDate); | updateT.setPaymentTime(currentDate); | ||||
| updateT.updateTenantInfo(updateOrder); | |||||
| //拼团到此处为已完成状态 | //拼团到此处为已完成状态 | ||||
| if (updateOrder.getOrderGroupId().equals(0L)) { | if (updateOrder.getOrderGroupId().equals(0L)) { | ||||
| updateT.setOrderStatus(EnumOrderStatus.ORDER_STATUS_PAYMENT_SUCCESS.getCode()); | updateT.setOrderStatus(EnumOrderStatus.ORDER_STATUS_PAYMENT_SUCCESS.getCode()); | ||||
| @@ -1436,7 +1437,7 @@ public class WxOrderServiceImpl implements WxOrderService { | |||||
| */ | */ | ||||
| public void actionAfterCouponOrderSuccess(WxOrder updateOrder, WxCoupon coupon, WxCUserBasicInfo user) { | public void actionAfterCouponOrderSuccess(WxOrder updateOrder, WxCoupon coupon, WxCUserBasicInfo user) { | ||||
| /// TODO 晚上会定时打一下tag | /// TODO 晚上会定时打一下tag | ||||
| wxCUserTagsService.triggerAssignTags(EnumAssignTagsTrigger.ASSIGN_TAGS_TRIGGER_BUY, user); | |||||
| wxCUserTagsService.triggerAssignTags(EnumAssignTagsTrigger.ASSIGN_TAGS_TRIGGER_BUY, user,updateOrder); | |||||
| // 交易发券 | // 交易发券 | ||||
| try { | try { | ||||
| @@ -361,6 +361,7 @@ public class WxProfitSharingOrderServiceImpl implements WxProfitSharingOrderServ | |||||
| //是否已创建分账订单 | //是否已创建分账订单 | ||||
| record.setOrderId(wxProfitSharingOrder.getOrderId()); | record.setOrderId(wxProfitSharingOrder.getOrderId()); | ||||
| record.updateTenantInfo(wxProfitSharingOrder); | |||||
| record = wxProfitSharingOrderMapper.selectOne(new QueryWrapper(record)); | record = wxProfitSharingOrderMapper.selectOne(new QueryWrapper(record)); | ||||
| if (record == null) | if (record == null) | ||||
| return new ResultData(ErrorCode.ORDER_IS_NOT_FIND); | return new ResultData(ErrorCode.ORDER_IS_NOT_FIND); | ||||
| @@ -381,6 +382,7 @@ public class WxProfitSharingOrderServiceImpl implements WxProfitSharingOrderServ | |||||
| WxProfitSharingResult result = new WxProfitSharingResult(); | WxProfitSharingResult result = new WxProfitSharingResult(); | ||||
| result.setSharingOrderId(record.getId()); | result.setSharingOrderId(record.getId()); | ||||
| result.updateTenantInfo(wxProfitSharingOrder); | |||||
| List <WxProfitSharingResult> wxProfitSharingResultList = wxProfitSharingResultMapper.findList(result); | List <WxProfitSharingResult> wxProfitSharingResultList = wxProfitSharingResultMapper.findList(result); | ||||
| for(int j = 0; j < jReceivers.size() ; j++) { | for(int j = 0; j < jReceivers.size() ; j++) { | ||||
| @@ -73,7 +73,7 @@ public class ParkHelper { | |||||
| wxScoreRulesService.addScore(userCar,EnumScoreType.BIND_CAR, userCar); | wxScoreRulesService.addScore(userCar,EnumScoreType.BIND_CAR, userCar); | ||||
| //增加积分 | //增加积分 | ||||
| addCredit(park, cuUserId); | addCredit(park, cuUserId); | ||||
| wxCUserTagsService.triggerAssignTags(EnumAssignTagsTrigger.ASSIGN_TAGS_TRIGGER_CAR,userCar); | |||||
| wxCUserTagsService.triggerAssignTags(EnumAssignTagsTrigger.ASSIGN_TAGS_TRIGGER_CAR,userCar,park); | |||||
| } | } | ||||
| //-----增加积分start----- | //-----增加积分start----- | ||||
| @@ -216,6 +216,7 @@ public class WxMiniMaPayAdapterService extends BaseWxPayAdapterService implement | |||||
| //String isSubscribe = returnMap.get("sub_is_subscribe"); | //String isSubscribe = returnMap.get("sub_is_subscribe"); | ||||
| userQ.setOpenId(openId); | userQ.setOpenId(openId); | ||||
| userQ.setAppId(appInfo.getAppId()); | userQ.setAppId(appInfo.getAppId()); | ||||
| userQ.updateTenantInfo(appInfo); | |||||
| WxCUser user1 = wxCUserMapper.findByOpenId(userQ); | WxCUser user1 = wxCUserMapper.findByOpenId(userQ); | ||||
| if (user1 == null) { | if (user1 == null) { | ||||
| return null; | return null; | ||||