diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserBasicInfoController.java b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserBasicInfoController.java index a7be97322..fcb96418e 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserBasicInfoController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserBasicInfoController.java @@ -204,7 +204,7 @@ public class WxCUserBasicInfoController extends BaseController { wxCUserBasicInfo.setFinalTenantId(tenantEntity.getFinalTenantId()); wxCUserBasicInfoService.update(wxCUserBasicInfo); wxCUserBasicInfo.updateTenantInfo(oldInfo); - wxCUserTagsService.triggerAssignTags(EnumAssignTagsTrigger.ASSIGN_TAGS_TRIGGER_IMPORT, wxCUserBasicInfo); + wxCUserTagsService.triggerAssignTags(EnumAssignTagsTrigger.ASSIGN_TAGS_TRIGGER_IMPORT, wxCUserBasicInfo,tenantEntity); return new ResultData(); } diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCUserController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCUserController.java index 7d055b49f..af0d91da9 100755 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCUserController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCUserController.java @@ -120,7 +120,7 @@ public class WxCUserController extends BaseController { wxScoreRulesService.addScore(getTenantInfo(),EnumScoreType.COMPLETE_INFO, wxCUserBasicInfo); //增加积分 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端的会员关联数据 wxCUserFromB = new WxCUserFromB(); wxCUserFromB.setBUserId(wxCUserFromBDto.getUserId()); @@ -181,7 +181,7 @@ public class WxCUserController extends BaseController { wxScoreRulesService.addScore(getTenantInfo(),EnumScoreType.COMPLETE_INFO, wxCUserBasicInfo); //增加积分 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端来源会员 wxCUserFromB.setInfo(JSONObject.toJSONString(wxCUserBasicInfo)); wxCUserFromBService.saveOrUpdate(wxCUserFromB); diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxMsgValidationcodeController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxMsgValidationcodeController.java index 6cd669fae..d98bc9c18 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxMsgValidationcodeController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxMsgValidationcodeController.java @@ -89,7 +89,7 @@ public class WxMsgValidationcodeController extends BaseController { wxCUserService.saveOrUpdate(user); wxCUserService.delForUserIdOnly(user.getId(),user.getUserId(),user.getTenantId()); // 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()); } diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java index 823e673d6..10aab1351 100755 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java @@ -687,7 +687,7 @@ public class WxUserGrantController extends BaseController { } wxCUserService.saveOrUpdate(user); 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(); @@ -977,7 +977,7 @@ public class WxUserGrantController extends BaseController { wxCreditHistory.setOperatorType(EnumUserType.CUSER.getCode()); wxCreditHistory.setOperatorId(memberId); wxCreditHistoryService.saveOrUpdate(wxCreditHistory); - wxCUserTagsService.triggerAssignTags(EnumAssignTagsTrigger.ASSIGN_TAGS_TRIGGER_IMPORT, record); + wxCUserTagsService.triggerAssignTags(EnumAssignTagsTrigger.ASSIGN_TAGS_TRIGGER_IMPORT, record,tenantEntity); } return new ResultData(); } diff --git a/mallinkCallback/src/main/java/com/iformall/controller/callback/WxCarCYFCallBackController.java b/mallinkCallback/src/main/java/com/iformall/controller/callback/car/WxCarCYFCallBackController.java similarity index 99% rename from mallinkCallback/src/main/java/com/iformall/controller/callback/WxCarCYFCallBackController.java rename to mallinkCallback/src/main/java/com/iformall/controller/callback/car/WxCarCYFCallBackController.java index 0374bd795..25b45e867 100644 --- a/mallinkCallback/src/main/java/com/iformall/controller/callback/WxCarCYFCallBackController.java +++ b/mallinkCallback/src/main/java/com/iformall/controller/callback/car/WxCarCYFCallBackController.java @@ -1,4 +1,4 @@ -package com.iformall.controller.callback; +package com.iformall.controller.callback.car; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; diff --git a/mallinkCallback/src/main/java/com/iformall/controller/callback/WxCarETCPCallBackController.java b/mallinkCallback/src/main/java/com/iformall/controller/callback/car/WxCarETCPCallBackController.java similarity index 99% rename from mallinkCallback/src/main/java/com/iformall/controller/callback/WxCarETCPCallBackController.java rename to mallinkCallback/src/main/java/com/iformall/controller/callback/car/WxCarETCPCallBackController.java index eaa2b60d3..7fcbb42a8 100644 --- a/mallinkCallback/src/main/java/com/iformall/controller/callback/WxCarETCPCallBackController.java +++ b/mallinkCallback/src/main/java/com/iformall/controller/callback/car/WxCarETCPCallBackController.java @@ -1,4 +1,4 @@ -package com.iformall.controller.callback; +package com.iformall.controller.callback.car; import com.alibaba.fastjson.JSON; import com.github.pagehelper.PageInfo; diff --git a/mallinkCallback/src/main/java/com/iformall/controller/callback/WxCarTJDCallBackController.java b/mallinkCallback/src/main/java/com/iformall/controller/callback/car/WxCarTJDCallBackController.java similarity index 99% rename from mallinkCallback/src/main/java/com/iformall/controller/callback/WxCarTJDCallBackController.java rename to mallinkCallback/src/main/java/com/iformall/controller/callback/car/WxCarTJDCallBackController.java index ea8bf0d78..89e058d9f 100644 --- a/mallinkCallback/src/main/java/com/iformall/controller/callback/WxCarTJDCallBackController.java +++ b/mallinkCallback/src/main/java/com/iformall/controller/callback/car/WxCarTJDCallBackController.java @@ -1,4 +1,4 @@ -package com.iformall.controller.callback; +package com.iformall.controller.callback.car; import com.alibaba.fastjson.JSON; import com.github.pagehelper.PageInfo; diff --git a/mallinkCallback/src/main/java/com/iformall/controller/callback/WxParkCallBackBaseController.java b/mallinkCallback/src/main/java/com/iformall/controller/callback/car/WxParkCallBackBaseController.java similarity index 99% rename from mallinkCallback/src/main/java/com/iformall/controller/callback/WxParkCallBackBaseController.java rename to mallinkCallback/src/main/java/com/iformall/controller/callback/car/WxParkCallBackBaseController.java index 6d59a30e0..3c6940343 100644 --- a/mallinkCallback/src/main/java/com/iformall/controller/callback/WxParkCallBackBaseController.java +++ b/mallinkCallback/src/main/java/com/iformall/controller/callback/car/WxParkCallBackBaseController.java @@ -1,4 +1,4 @@ -package com.iformall.controller.callback; +package com.iformall.controller.callback.car; import com.alibaba.fastjson.JSON; import com.github.pagehelper.PageInfo; diff --git a/mallinkCallback/src/main/java/com/iformall/controller/callback/cyf/WxCarCYFCallBackController.java b/mallinkCallback/src/main/java/com/iformall/controller/callback/car/cyf/WxCarCYFCallBackController.java similarity index 96% rename from mallinkCallback/src/main/java/com/iformall/controller/callback/cyf/WxCarCYFCallBackController.java rename to mallinkCallback/src/main/java/com/iformall/controller/callback/car/cyf/WxCarCYFCallBackController.java index 2884ebd93..4d85a06f0 100644 --- a/mallinkCallback/src/main/java/com/iformall/controller/callback/cyf/WxCarCYFCallBackController.java +++ b/mallinkCallback/src/main/java/com/iformall/controller/callback/car/cyf/WxCarCYFCallBackController.java @@ -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.JSONObject; import com.github.pagehelper.PageInfo; import com.iformall.common.Result; 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.vo.WxCarCYFVo; import com.iformall.enums.EnumCarCmd; diff --git a/mallinkCallback/src/main/java/com/iformall/controller/callback/car/jieshun/WxCarJieShunCallBackController.java b/mallinkCallback/src/main/java/com/iformall/controller/callback/car/jieshun/WxCarJieShunCallBackController.java new file mode 100644 index 000000000..1c4b2e9b5 --- /dev/null +++ b/mallinkCallback/src/main/java/com/iformall/controller/callback/car/jieshun/WxCarJieShunCallBackController.java @@ -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 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 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 paramMap) { + log.info("["+getIpAddr()+"] cyfParkInCallback: " + paramMap.toString()); + //解析车易付参数 + return super.paidCallback(EnumCarVendor.CAE_CYF, EnumCarCmd.CAR_CYF_CALLBACK_PAID, paramMap); + } +} diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/WxCUserTagsSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/WxCUserTagsSchedule.java index 8e0f6c4ba..03068e16f 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/WxCUserTagsSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/WxCUserTagsSchedule.java @@ -63,7 +63,7 @@ public class WxCUserTagsSchedule { page = wxCUserBasicInfoService.listAsPage(wxCUserBasicInfo, pageIndex++, pageSize); page.getList().stream().forEach(cubi -> { 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) { logger.error("wxCUserTagsSchedule error."+cubi.toString(),e); } diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumCarVendor.java b/mallinkService/src/main/java/com/iformall/enums/EnumCarVendor.java index 7b18e5d58..5c7696402 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumCarVendor.java +++ b/mallinkService/src/main/java/com/iformall/enums/EnumCarVendor.java @@ -13,6 +13,7 @@ public enum EnumCarVendor { CAR_SHANGAN(4, "ShangAn"), CAR_BOLINK(5, "BoLink"), CAE_CYF(6,"CYF"), + CAR_JIESHUN(7,"JIESHUN") ; public static EnumCarVendor getEnum(Integer code) { diff --git a/mallinkService/src/main/java/com/iformall/service/WxCUserTagsService.java b/mallinkService/src/main/java/com/iformall/service/WxCUserTagsService.java index 67d7fb9da..0651c440d 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxCUserTagsService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxCUserTagsService.java @@ -48,7 +48,7 @@ public interface WxCUserTagsService { List assignTags(List tagIdList,WxCUserBasicInfo user); - List triggerAssignTags(EnumAssignTagsTrigger trigger, Object obj); + List triggerAssignTags(EnumAssignTagsTrigger trigger, Object obj,TenantEntity tenantEntity); void updateTagByUserId(Long cUserId,TenantEntity tenantinfo, List tags); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserServiceImpl.java index 25041df10..653b24bcb 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserServiceImpl.java @@ -304,7 +304,7 @@ public class WxCUserServiceImpl implements WxCUserService { cUser.setTenantId(user.getTenantId()); saveOrUpdate(cUser); } - wxCUserTagsService.triggerAssignTags(EnumAssignTagsTrigger.ASSIGN_TAGS_TRIGGER_LOGIN, wxCUser); + wxCUserTagsService.triggerAssignTags(EnumAssignTagsTrigger.ASSIGN_TAGS_TRIGGER_LOGIN, wxCUser,user); } // 用户从unionId来的,可能会有重复 // if(findByUnionId != null) { diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserTagsServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserTagsServiceImpl.java index 3853c37ce..14877221b 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserTagsServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserTagsServiceImpl.java @@ -351,7 +351,7 @@ public class WxCUserTagsServiceImpl implements WxCUserTagsService { } - private List assignTypeId14(WxCUserBasicInfo user) + private List assignTypeId14(WxCUserBasicInfo user,TenantEntity tenantEntity) { List resList = null; Calendar endC = Calendar.getInstance(); @@ -364,12 +364,14 @@ public class WxCUserTagsServiceImpl implements WxCUserTagsService { wxCouponOrder.setCouponOrderStatus(EnumCouponOrderStatus.COUPON_ORDER_USED.getCode()); wxCouponOrder.setStartTime(startC.getTime()); wxCouponOrder.setEndTime(endC.getTime()); + wxCouponOrder.updateTenantInfo(tenantEntity); WxCardSpend wxCardSpend = new WxCardSpend(); wxCardSpend.setOwnerId(user.getId()); wxCardSpend.setStartdate(startC.getTime()); wxCardSpend.setEnddate(endC.getTime()); - + wxCardSpend.updateTenantInfo(tenantEntity); + WxBusiness business = new WxBusiness(); List list = wxBusinessMapper.findList(business); @@ -603,7 +605,7 @@ public class WxCUserTagsServiceImpl implements WxCUserTagsService { //打标触发 @Override - public List triggerAssignTags(EnumAssignTagsTrigger trigger, Object obj) { + public List triggerAssignTags(EnumAssignTagsTrigger trigger, Object obj,TenantEntity tenantEntity) { if (obj == null) return null; @@ -665,7 +667,7 @@ public class WxCUserTagsServiceImpl implements WxCUserTagsService { WxCUserBasicInfo user = (WxCUserBasicInfo) obj; if (user != null) { //消费类别 - resList = assignTypeId14(user); + resList = assignTypeId14(user,tenantEntity); //饮食偏好 resList = assignTypeId17(user); //消费时段 @@ -730,7 +732,7 @@ public class WxCUserTagsServiceImpl implements WxCUserTagsService { } //消费类别 - resList = assignTypeId14(user); + resList = assignTypeId14(user,tenantEntity); //饮食偏好 resList = assignTypeId17(user); @@ -756,7 +758,7 @@ public class WxCUserTagsServiceImpl implements WxCUserTagsService { } }catch (Exception e) { - logger.error("triggerAssignTags Failed:" + trigger.getMessage() + e.getMessage()); + logger.error("triggerAssignTags Failed:" + trigger.getMessage() + e.getMessage(),e); } return resList; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java index 3c353529a..256c86ee6 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java @@ -678,6 +678,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { merchantSubsidyQ.setCouponOrderId(couponOrder.getId()); merchantSubsidyQ.setCouponType(couponOrder.getCouponType()); merchantSubsidyQ.setType(EnumMerchantSubsidyType.MANUAL.getCode()); + merchantSubsidyQ.updateTenantInfo(couponOrder); List msList = wxMerchantSubsidyMapper.selectList(new QueryWrapper(merchantSubsidyQ)); if (msList.size() > 0) { // 补贴已入库 diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java index 6b1ff597e..37003cf5f 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java @@ -1347,6 +1347,7 @@ public class WxOrderServiceImpl implements WxOrderService { WxOrder updateT = new WxOrder(); updateT.setId(updateOrder.getId()); updateT.setPaymentTime(currentDate); + updateT.updateTenantInfo(updateOrder); //拼团到此处为已完成状态 if (updateOrder.getOrderGroupId().equals(0L)) { 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) { /// TODO 晚上会定时打一下tag - wxCUserTagsService.triggerAssignTags(EnumAssignTagsTrigger.ASSIGN_TAGS_TRIGGER_BUY, user); + wxCUserTagsService.triggerAssignTags(EnumAssignTagsTrigger.ASSIGN_TAGS_TRIGGER_BUY, user,updateOrder); // 交易发券 try { diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingOrderServiceImpl.java index f2d48d5f2..44fc7454a 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingOrderServiceImpl.java @@ -361,6 +361,7 @@ public class WxProfitSharingOrderServiceImpl implements WxProfitSharingOrderServ //是否已创建分账订单 record.setOrderId(wxProfitSharingOrder.getOrderId()); + record.updateTenantInfo(wxProfitSharingOrder); record = wxProfitSharingOrderMapper.selectOne(new QueryWrapper(record)); if (record == null) return new ResultData(ErrorCode.ORDER_IS_NOT_FIND); @@ -381,6 +382,7 @@ public class WxProfitSharingOrderServiceImpl implements WxProfitSharingOrderServ WxProfitSharingResult result = new WxProfitSharingResult(); result.setSharingOrderId(record.getId()); + result.updateTenantInfo(wxProfitSharingOrder); List wxProfitSharingResultList = wxProfitSharingResultMapper.findList(result); for(int j = 0; j < jReceivers.size() ; j++) { diff --git a/mallinkService/src/main/java/com/iformall/service/park/impl/util/ParkHelper.java b/mallinkService/src/main/java/com/iformall/service/park/impl/util/ParkHelper.java index 4de19ed39..ef11e4f57 100644 --- a/mallinkService/src/main/java/com/iformall/service/park/impl/util/ParkHelper.java +++ b/mallinkService/src/main/java/com/iformall/service/park/impl/util/ParkHelper.java @@ -73,7 +73,7 @@ public class ParkHelper { wxScoreRulesService.addScore(userCar,EnumScoreType.BIND_CAR, userCar); //增加积分 addCredit(park, cuUserId); - wxCUserTagsService.triggerAssignTags(EnumAssignTagsTrigger.ASSIGN_TAGS_TRIGGER_CAR,userCar); + wxCUserTagsService.triggerAssignTags(EnumAssignTagsTrigger.ASSIGN_TAGS_TRIGGER_CAR,userCar,park); } //-----增加积分start----- diff --git a/mallinkService/src/main/java/com/iformall/service/pay/service/pay/wx/miniApp/maPay/WxMiniMaPayAdapterService.java b/mallinkService/src/main/java/com/iformall/service/pay/service/pay/wx/miniApp/maPay/WxMiniMaPayAdapterService.java index bb96416ab..fec927337 100644 --- a/mallinkService/src/main/java/com/iformall/service/pay/service/pay/wx/miniApp/maPay/WxMiniMaPayAdapterService.java +++ b/mallinkService/src/main/java/com/iformall/service/pay/service/pay/wx/miniApp/maPay/WxMiniMaPayAdapterService.java @@ -216,6 +216,7 @@ public class WxMiniMaPayAdapterService extends BaseWxPayAdapterService implement //String isSubscribe = returnMap.get("sub_is_subscribe"); userQ.setOpenId(openId); userQ.setAppId(appInfo.getAppId()); + userQ.updateTenantInfo(appInfo); WxCUser user1 = wxCUserMapper.findByOpenId(userQ); if (user1 == null) { return null;