From 93789ec25cf254ec042d49f1ada002be5ab7da84 Mon Sep 17 00:00:00 2001 From: xhxu Date: Thu, 8 Dec 2022 19:27:56 +0800 Subject: [PATCH] //verify --- .../controller/WxCouponOrderController.java | 4 +- .../java/com/iformall/b/CouponsendTest.java | 2 +- .../controller/WxCouponOrderController.java | 4 +- .../iformall/service/impl/PosServiceImpl.java | 2 +- .../schedule/CouponOrderExpiringSchedule.java | 4 +- .../po/msg/FmInsideCouponVerifyMsg.java | 2 +- .../iformall/enums/EnumCouponVerifyType.java | 2 +- .../service/WxCouponOrderService.java | 7 +- .../impl/WxCouponOrderServiceImpl.java | 165 +++++++++--------- .../service/impl/WxPayOrderServiceImpl.java | 4 +- .../FmInsideCouponVerifyMsgServiceImpl.java | 17 +- 11 files changed, 102 insertions(+), 111 deletions(-) diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderController.java index 3ba3ec6c2..d269b81da 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderController.java @@ -409,8 +409,8 @@ public class WxCouponOrderController extends BaseController { return new ResultData(ErrorCode.VERIFY_ERROR, e.getMessage()); } - if (couponOrder != null && couponOrder.getMerchantId() != null) { - wxCouponOrderService.sendInsideCouponVerifyMsg(wxMerchantBUser,couponOrder, couponOrderId, couponOrder.getMerchantId(),couponOrder.getBMerchantId()); + if (couponOrder != null) { + wxCouponOrderService.sendInsideCouponVerifyMsg(couponOrder.getId(), couponOrder, couponOrder.getBMerchantId(), wxMerchantBUser); } return new ResultData(couponOrder); diff --git a/mallinkBApi/src/test/java/com/iformall/b/CouponsendTest.java b/mallinkBApi/src/test/java/com/iformall/b/CouponsendTest.java index 4a262d637..26af4c590 100644 --- a/mallinkBApi/src/test/java/com/iformall/b/CouponsendTest.java +++ b/mallinkBApi/src/test/java/com/iformall/b/CouponsendTest.java @@ -89,7 +89,7 @@ public class CouponsendTest { log.error("券包ID未找到: " + couponOrderId); throw new MallinkException(ErrorCode.COUPON_ORDER_IS_NULL.getCode(), "券包ID未找到" + couponOrderId); } - wxCouponOrderService.subsidyAfterVerify(couponOrder, merchantId); +// wxCouponOrderService.subsidyAfterVerify(couponOrder, merchantId); } diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponOrderController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponOrderController.java index 327e90c73..4b6926c44 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponOrderController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponOrderController.java @@ -518,8 +518,8 @@ public class WxCouponOrderController extends BaseController { return new ResultData(ErrorCode.VERIFY_ERROR, e.getMessage()); } - if (couponOrder != null && couponOrder.getMerchantId() != null) { - wxCouponOrderService.sendInsideCouponVerifyMsg(couponOrder,couponOrder, couponOrderId, couponOrder.getMerchantId(),couponOrder.getBMerchantId()); + if (couponOrder != null) { + wxCouponOrderService.sendInsideCouponVerifyMsg(couponOrder.getId(),couponOrder, couponOrder.getBMerchantId(), couponOrder); } return new ResultData(couponOrder); diff --git a/mallinkPosApi/src/main/java/com/iformall/service/impl/PosServiceImpl.java b/mallinkPosApi/src/main/java/com/iformall/service/impl/PosServiceImpl.java index f1154309f..ea5c90ac2 100644 --- a/mallinkPosApi/src/main/java/com/iformall/service/impl/PosServiceImpl.java +++ b/mallinkPosApi/src/main/java/com/iformall/service/impl/PosServiceImpl.java @@ -2186,7 +2186,7 @@ public class PosServiceImpl implements PosService { logger.error("交易核销积分异常:" + e.getMessage()); } // 3. 核销后处理 - couponOrderService.sendInsideCouponVerifyMsg(wxMerchant,merchantBUser, couponOrderId, merchantBUser.getMerchantId(),merchantBUser.getMerchantId()); + couponOrderService.sendInsideCouponVerifyMsg(couponOrderId,merchantBUser,merchantBUser.getMerchantId(),merchantBUser); } return payOrder; } diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/CouponOrderExpiringSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/CouponOrderExpiringSchedule.java index fb019d771..33033768f 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/CouponOrderExpiringSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/CouponOrderExpiringSchedule.java @@ -133,8 +133,8 @@ public class CouponOrderExpiringSchedule { logger.error("核销异常: " + e.getMessage()); } - if (couponOrder != null && couponOrder.getMerchantId() != null) { - wxCouponOrderService.sendInsideCouponVerifyMsg(mall,couponOrder, couponOrder.getId(), couponOrder.getMerchantId(),couponOrder.getBMerchantId()); + if (couponOrder != null) { + wxCouponOrderService.sendInsideCouponVerifyMsg(couponOrder.getId(),couponOrder, couponOrder.getBMerchantId(), couponOrder); } }); } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/msg/FmInsideCouponVerifyMsg.java b/mallinkService/src/main/java/com/iformall/domain/po/msg/FmInsideCouponVerifyMsg.java index ccb05c418..cce2dc3bc 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/msg/FmInsideCouponVerifyMsg.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/msg/FmInsideCouponVerifyMsg.java @@ -12,7 +12,7 @@ public class FmInsideCouponVerifyMsg extends BaseMsg{ @io.swagger.annotations.ApiModelProperty(value = "券包ID", name = "couponOrderId") private Long couponOrderId; - @io.swagger.annotations.ApiModelProperty(value = "分账商户", name = "merchantId") + @io.swagger.annotations.ApiModelProperty(value = "商户", name = "merchantId") private Long merchantId; @io.swagger.annotations.ApiModelProperty(value = "核销商户", name = "bmerchantId") private Long bmerchantId; diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumCouponVerifyType.java b/mallinkService/src/main/java/com/iformall/enums/EnumCouponVerifyType.java index 96e80bce4..c00b43b49 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumCouponVerifyType.java +++ b/mallinkService/src/main/java/com/iformall/enums/EnumCouponVerifyType.java @@ -7,7 +7,7 @@ public enum EnumCouponVerifyType { // 0: 微信B端核销 1:POS独立核销 2:POS交易核销 VERIFY_B(0,"B端核销"), - //verifyRemark + //verifyRemark 记录使用 VERIFY_B_10(10,"B端收银核销"), VERIFY_B_11(11,"B端券码核销"), VERIFY_B_12(12,"B端扫码核销"), diff --git a/mallinkService/src/main/java/com/iformall/service/WxCouponOrderService.java b/mallinkService/src/main/java/com/iformall/service/WxCouponOrderService.java index 08c613149..047f54fd2 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxCouponOrderService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxCouponOrderService.java @@ -66,16 +66,15 @@ public interface WxCouponOrderService { /** * 核销后发送消息 */ - void sendInsideCouponVerifyMsg(TenantEntity mallTenantEntity,TenantEntity couponOrderTenantEntity, Long couponOrderId, Long merchantId, Long bmerchantId); + void sendInsideCouponVerifyMsg(Long couponOrderId, TenantEntity couponOrderTenantEntity, Long merchantId, TenantEntity mallTenantEntity); /** * 核销后处理 * * @param couponOrder - * @param merchant 分账商户 * @param bmerchant 核销商户 */ - void actionAfterVerify(WxCouponOrder couponOrder, WxMerchant merchant, WxMerchant bmerchant); + void actionAfterVerify(WxCouponOrder couponOrder, WxMerchant merchant); /** * 核销发券 @@ -101,7 +100,7 @@ public interface WxCouponOrderService { * 核销后补贴 * @param couponOrder */ - void subsidyAfterVerify(WxCouponOrder couponOrder, Long merchantId); + void subsidyAfterVerify(WxCouponOrder couponOrder, WxMerchant merchant); /** * 核销模板消息 * @param couponOrder 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 b257c4611..397cff1c2 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java @@ -1297,14 +1297,6 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { List bolist = handleQueryResult(cUserEntry,list,wxCouponOrder); excelService.exportCsv(bolist, null, filename, WxCouponOrderBVo.class, filename + ".csv", response, false); } - - private WxAppinfo getAppinfo(TenantEntity tenantEntity,Integer payWay) { - WxAppinfo wxAppinfo = wxAppinfoService.getCAppInfo(tenantEntity, EnumPayWay.getEnum(payWay).getPlat()); - if (wxAppinfo == null) - throw new MallinkException(ErrorCode.APP_ID_NOT_FOUND); - - return wxAppinfo; - } @Override @Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class}) @@ -1380,7 +1372,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { throw new MallinkException(ErrorCode.VERIFY_COUPON_TYPE_NOT_SUPPORT); } WxCouponMerchant wxCouponMerchant = new WxCouponMerchant(); - wxCouponMerchant.updateTenantInfo(bUser); + wxCouponMerchant.updateTenantInfo(mallTenantEntity); wxCouponMerchant.setProductId(wxCoupon.getId()); wxCouponMerchant.setStatus(EnumCouponMerchantStatus.COUPON_MERCHANT_STATUS_VALID.getCode()); List couponMerchantList = wxCouponMerchantMapper.findList(wxCouponMerchant); @@ -1404,20 +1396,21 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { if (null == receiver) { throw new MallinkException(ErrorCode.VERIFY_COUPON_ORDER_MERCHANT_IS_NULL.getCode(),"当前商户没有配置收款账号。"); } - }else if(wxPayOrder != null && EnumPayMchType.DIRECT.getCode().equals(wxPayOrder.getMchType())){ - merchantId = wxPayOrder.getChildOrderShare(couponOrder.getOrderId()).getMerchantId(); - if (null == merchantId) { - throw new MallinkException(ErrorCode.VERIFY_COUPON_ORDER_MERCHANT_IS_NULL.getCode(),"订单支付信息未包含商户"); - } } +// else if(wxPayOrder != null && EnumPayMchType.DIRECT.getCode().equals(wxPayOrder.getMchType())){ +// merchantId = wxPayOrder.getChildOrderShare(couponOrder.getOrderId()).getMerchantId(); +// if (null == merchantId) { +// throw new MallinkException(ErrorCode.VERIFY_COUPON_ORDER_MERCHANT_IS_NULL.getCode(),"订单支付信息未包含商户"); +// } +// } } int num = 0; try { couponOrder.setCouponOrderStatus(EnumCouponOrderStatus.COUPON_ORDER_USED.getCode()); //1核销 couponOrder.setBUserId(bUser==null?0l:bUser.getId()); - couponOrder.setBMerchantId(bUser==null?0l:bUser.getMerchantId()); - couponOrder.setBTenantId(bUser==null?null:bUser.getTenantId()); + couponOrder.setBMerchantId(merchantId==null?0l:merchantId); + couponOrder.setBTenantId(mallTenantEntity.getTenantId()); couponOrder.setVerifyType(couponVerifyType.getCode()); if(EnumCouponVerifyType.VERIFY_B.equals(couponVerifyType) && StringUtils.isNotBlank(couponOrder.getVerifyRemark())){ @@ -1454,12 +1447,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { } } - if(EnumCouponVerifyType.VERIFY_B.equals(couponVerifyType)){ - doAfterVerify(couponOrder, bUser, wxCoupon); - }else{ - doAfterVerify(couponOrder, wxCoupon, merchantId); - } - couponOrder.setMerchantId(merchantId); + doAfterVerify(couponOrder, bUser, wxCoupon); return couponOrder; } @@ -1543,15 +1531,15 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { throw new MallinkException(ErrorCode.VERIFY_ERROR.getCode(), e.getMessage()); } - if (couponOrder != null && couponOrder.getMerchantId() != null) { - this.sendInsideCouponVerifyMsg(wxMerchantBUser,couponOrder, couponOrderId, couponOrder.getMerchantId(),couponOrder.getBMerchantId()); + if (couponOrder != null) { + this.sendInsideCouponVerifyMsg(couponOrder.getId(),couponOrder, wxMerchantBUser.getMerchantId(), wxMerchantBUser); } return couponOrder; } /** - * B端核销卷增加成长值,积分 + * 核销增加成长值,积分 * @param couponOrder * @param bUser * @param wxCoupon @@ -1567,10 +1555,20 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { // 积分 try { + //-------此处为【现金支付】记录增加积分操作------- WxCreditHistory creditHistory = new WxCreditHistory(); - creditHistory.setOperatorType(EnumUserType.BUSER.getCode()); - creditHistory.setOperatorId(bUser.getId()); + if(bUser != null){ + creditHistory.setOperatorType(EnumUserType.BUSER.getCode()); + creditHistory.setOperatorId(bUser.getId()); + creditHistory.setMerchantId(bUser.getMerchantId()); + creditHistory.setBuserId(bUser.getBuserId()); + }else{ + creditHistory.setOperatorType(EnumUserType.CUSERBASIC.getCode()); + creditHistory.setOperatorId(couponOrder.getCUserId()); + creditHistory.setMerchantId(couponOrder.getBMerchantId()); + } + creditHistory.setCUserId(couponOrder.getcUserId()); creditHistory.setCreateDate(new Date()); // creditHistory.updateTenantInfo(couponOrder); @@ -1580,11 +1578,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { creditHistory.setCouponId(wxCoupon.getId()); creditHistory.setBusinessId(wxCoupon.getBusiness()); creditHistory.setSpend(couponOrder.getCouponPrice()); - //如果券与商户一对一 则直接将消费商户更新为此商户 若一对多 则消费商户显示多商户 - creditHistory.setMerchantId(bUser.getMerchantId()); - creditHistory.setBuserId(bUser.getBuserId()); - WxMerchant wxMerchant = wxMerchantMapper.selectById(bUser.getMerchantId()); - creditHistory.setChangePurpose("商户核销增加积分:商户名称["+wxMerchant.getName()+"] 券名称["+wxCoupon.getTitle()+"("+creditHistory.getSpendStr()+"元)] "); + creditHistory.setChangePurpose("券["+wxCoupon.getTitle()+"("+creditHistory.getSpendStr()+"元)] 使用成功"); wxCreditHistoryService.saveOrUpdate(creditHistory,couponOrder.getTenantId()); } catch (Exception e) { logger.error("积分值:" + e.getMessage()); @@ -1628,48 +1622,48 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { } } - /** - * 自主核销商品加成长值 积分 - * @param couponOrder - * @param wxCoupon - */ - private void doAfterVerify(WxCouponOrder couponOrder, WxCoupon wxCoupon,Long merchantId) { - // 成长值 - try { - WxOrder order = wxOrderMapper.selectById(couponOrder.getOrderId(),couponOrder.getTenantId()); - wxScoreRulesService.addScore2(couponOrder,EnumScoreType.CONSUMPTION, order, wxCoupon.getBusiness()); - } catch (Exception e) { - logger.error("成长值:" + e.getMessage()); - } - - // 积分 - try { - //-------此处为【现金支付】记录增加积分操作------- - WxCreditHistory creditHistory = new WxCreditHistory(); - creditHistory.setOperatorType(EnumUserType.CUSERBASIC.getCode()); - creditHistory.setOperatorId(couponOrder.getCUserId()); - creditHistory.setCUserId(couponOrder.getCUserId()); - creditHistory.setCreateDate(new Date()); -// creditHistory.updateTenantInfo(couponOrder); - creditHistory.setTenantId(couponOrder.getFinalTenantId()); - creditHistory.setFinalTenantId(couponOrder.getFinalTenantId()); - creditHistory.setCreditType(EnumScoreType.CONSUMPTION.getCode()); - creditHistory.setCouponId(wxCoupon.getId()); - creditHistory.setBusinessId(wxCoupon.getBusiness()); - creditHistory.setSpend(couponOrder.getCouponPrice()); - //如果券与商户一对一 则直接将消费商户更新为此商户 若一对多 则消费商户显示多商户 - creditHistory.setMerchantId(merchantId); - creditHistory.setChangePurpose("增加积分:券名称["+wxCoupon.getTitle()+"("+creditHistory.getSpendStr()+"元)] "); - wxCreditHistoryService.saveOrUpdate(creditHistory,couponOrder.getTenantId()); - } catch (Exception e) { - logger.error("积分值:" + e.getMessage()); - } - } +// /** +// * 自主核销商品加成长值 积分 +// * @param couponOrder +// * @param wxCoupon +// */ +// private void doAfterVerify(WxCouponOrder couponOrder, WxCoupon wxCoupon,Long merchantId) { +// // 成长值 +// try { +// WxOrder order = wxOrderMapper.selectById(couponOrder.getOrderId(),couponOrder.getTenantId()); +// wxScoreRulesService.addScore2(couponOrder,EnumScoreType.CONSUMPTION, order, wxCoupon.getBusiness()); +// } catch (Exception e) { +// logger.error("成长值:" + e.getMessage()); +// } +// +// // 积分 +// try { +// //-------此处为【现金支付】记录增加积分操作------- +// WxCreditHistory creditHistory = new WxCreditHistory(); +// creditHistory.setOperatorType(EnumUserType.CUSERBASIC.getCode()); +// creditHistory.setOperatorId(couponOrder.getCUserId()); +// creditHistory.setCUserId(couponOrder.getCUserId()); +// creditHistory.setCreateDate(new Date()); +//// creditHistory.updateTenantInfo(couponOrder); +// creditHistory.setTenantId(couponOrder.getFinalTenantId()); +// creditHistory.setFinalTenantId(couponOrder.getFinalTenantId()); +// creditHistory.setCreditType(EnumScoreType.CONSUMPTION.getCode()); +// creditHistory.setCouponId(wxCoupon.getId()); +// creditHistory.setBusinessId(wxCoupon.getBusiness()); +// creditHistory.setSpend(couponOrder.getCouponPrice()); +// //如果券与商户一对一 则直接将消费商户更新为此商户 若一对多 则消费商户显示多商户 +// creditHistory.setMerchantId(merchantId); +// creditHistory.setChangePurpose("增加积分:券名称["+wxCoupon.getTitle()+"("+creditHistory.getSpendStr()+"元)] "); +// wxCreditHistoryService.saveOrUpdate(creditHistory,couponOrder.getTenantId()); +// } catch (Exception e) { +// logger.error("积分值:" + e.getMessage()); +// } +// } @Override - public void sendInsideCouponVerifyMsg(TenantEntity mallTenantEntity,TenantEntity couponOrderTenantEntity, Long couponOrderId, Long merchantId, Long bmerchantId) { - if(bmerchantId == null || bmerchantId.longValue() == 0l){ - bmerchantId = merchantId; + public void sendInsideCouponVerifyMsg(Long couponOrderId, TenantEntity couponOrderTenantEntity, Long merchantId, TenantEntity mallTenantEntity) { + if(merchantId == null){ + return; } FmInsideCouponVerifyMsg verifyMsg = new FmInsideCouponVerifyMsg(); verifyMsg.setMsgType(EnumMsgRecordType.INSIDE_COUPON_VERIFY.getCode()); @@ -1677,12 +1671,11 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { verifyMsg.setMallTenantEntity(mallTenantEntity); verifyMsg.setCouponOrderId(couponOrderId); verifyMsg.setMerchantId(merchantId); - verifyMsg.setBmerchantId(bmerchantId); mqBaseProducer.sendMessage(verifyMsg, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode()); } @Override - public void actionAfterVerify(WxCouponOrder couponOrder, WxMerchant merchant, WxMerchant bmerchant) { + public void actionAfterVerify(WxCouponOrder couponOrder, WxMerchant merchant) { try { boolean mulityShare = true; @@ -1705,7 +1698,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { try { // 核销补贴 - subsidyAfterVerify(couponOrder, bmerchant.getId()); + subsidyAfterVerify(couponOrder, merchant); } catch (Exception e) { logger.error("核销记账失败"+e.getMessage(),e); } @@ -1719,7 +1712,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { } // 核销发模板消息 try { - sendVerifyMsg(couponOrder, bmerchant, bSentCoupon); + sendVerifyMsg(couponOrder, merchant, bSentCoupon); } catch (Exception e) { logger.error("核销发送消息发生错误:" + e.getMessage(),e); } @@ -1843,12 +1836,12 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { // 补贴 @Override @Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class}) - public void subsidyAfterVerify(WxCouponOrder couponOrder, Long merchantId) { + public void subsidyAfterVerify(WxCouponOrder couponOrder, WxMerchant merchant) { // 检查补贴是否入库 WxMerchantSubsidy subsidy = new WxMerchantSubsidy(); subsidy.setOrderId(couponOrder.getOrderId()); subsidy.setType(EnumMerchantSubsidyType.MANUAL.getCode()); - subsidy.updateTenantInfo(couponOrder); + subsidy.updateTenantInfo(merchant); List wmsList = wxMerchantSubsidyMapper.selectList(new QueryWrapper(subsidy)); if (wmsList.size() > 0) { logger.error("补贴已经入库: (orderId,type)-({},1)", couponOrder.getOrderId()); @@ -1859,18 +1852,18 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { WxCouponMerchant couponMerchantQ = new WxCouponMerchant(); couponMerchantQ.setProductId(couponOrder.getCouponId()); - couponMerchantQ.setMerchantId(merchantId); - couponMerchantQ.updateTenantInfo(couponOrder); + couponMerchantQ.setMerchantId(merchant.getId()); + couponMerchantQ.updateTenantInfo(merchant); WxCouponMerchant couponMerchant; try { couponMerchant = wxCouponMerchantMapper.selectOne(new QueryWrapper(couponMerchantQ)); } catch (Exception e) { - logger.error("查找所属卡券商户错误: " + "CouponId:" + couponMerchantQ.getProductId(), " merchantId:" + merchantId); + logger.error("查找所属卡券商户错误: " + "CouponId:" + couponMerchantQ.getProductId(), " merchantId:" + merchant.getId()); throw new MallinkException(ErrorCode.SYS_PARAMETER_ERROR); } if (couponMerchant == null) { - logger.error("未找到所属卡券商户: " + "CouponId:" + couponMerchantQ.getProductId(), " merchantId:" + merchantId); + logger.error("未找到所属卡券商户: " + "CouponId:" + couponMerchantQ.getProductId(), " merchantId:" + merchant.getId()); throw new MallinkException(ErrorCode.SYS_PARAMETER_ERROR); } @@ -1904,7 +1897,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { merchantSubsidyQ.setCouponOrderId(couponOrder.getId()); merchantSubsidyQ.setCouponType(couponOrder.getCouponType()); merchantSubsidyQ.setType(EnumMerchantSubsidyType.MANUAL.getCode()); - merchantSubsidyQ.updateTenantInfo(couponOrder); + merchantSubsidyQ.updateTenantInfo(merchant); List msList = wxMerchantSubsidyMapper.selectList(new QueryWrapper(merchantSubsidyQ)); if (msList.size() > 0) { // 补贴已入库 @@ -1921,10 +1914,10 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { WxMerchantSubsidy merchantSubsidy = new WxMerchantSubsidy(); merchantSubsidy.setId(idWorker.nextId()); - merchantSubsidy.updateTenantInfo(couponOrder); + merchantSubsidy.updateTenantInfo(merchant); merchantSubsidy.setOrderId(couponOrder.getOrderId()); merchantSubsidy.setOrderType(EnumOrderType.COUPON.getCode()); - merchantSubsidy.setMerchantId(merchantId); + merchantSubsidy.setMerchantId(merchant.getId()); merchantSubsidy.setCouponOrderId(couponOrder.getId()); merchantSubsidy.setCouponType(couponOrder.getCouponType()); merchantSubsidy.setOrderPayment(coupon.getPrice()); @@ -2159,7 +2152,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { private void doVerifyAppUniformMsg(WxCouponOrder couponOrder, WxCoupon coupon, WxMerchant merchant, WxCUser user, SimpleDateFormat dateFormat, String gotopage) { WxAuthorizerInfo authQ = new WxAuthorizerInfo(); authQ.setAuthorizerAppid(user.getAppId()); - authQ.updateTenantInfo(merchant); + authQ.updateTenantInfo(couponOrder); WxAuthorizerInfo weappInfo = authorizerInfoMapper.findMp(authQ); if (weappInfo != null) { AppUniformMsg appUniformMsg = new AppUniformMsg(); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java index 15a8db29c..c1ecdc837 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java @@ -1123,7 +1123,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { logger.error(e.getMessage()); } // 更新后处理 - wxCouponOrderService.sendInsideCouponVerifyMsg(user,unPayOrder, unPayOrder.getPosPayOrderId(), user.getMerchantId(),user.getMerchantId()); + wxCouponOrderService.sendInsideCouponVerifyMsg(unPayOrder.getPosPayOrderId(),user,user.getMerchantId(), user); } } } catch (Exception e) { @@ -1244,7 +1244,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { logger.error(e.getMessage()); } // 更新后处理 - wxCouponOrderService.sendInsideCouponVerifyMsg(user,unPayOrder, unPayOrder.getPosPayOrderId(), user.getMerchantId(),user.getMerchantId()); + wxCouponOrderService.sendInsideCouponVerifyMsg(unPayOrder.getPosPayOrderId(),user,user.getMerchantId(),user); } } } catch (Exception e) { diff --git a/mallinkService/src/main/java/com/iformall/service/msg/impl/FmInsideCouponVerifyMsgServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/msg/impl/FmInsideCouponVerifyMsgServiceImpl.java index 8e6897d0e..69c1548d8 100644 --- a/mallinkService/src/main/java/com/iformall/service/msg/impl/FmInsideCouponVerifyMsgServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/msg/impl/FmInsideCouponVerifyMsgServiceImpl.java @@ -38,7 +38,12 @@ public class FmInsideCouponVerifyMsgServiceImpl implements MsgSendService { @Override public void send(BaseMsg baseMsg) throws Exception{ FmInsideCouponVerifyMsg msg = (FmInsideCouponVerifyMsg)baseMsg; - WxCouponOrder couponOrder = couponOrderService.getById(msg.getCouponOrderId(),msg.getTenantId()); + + TenantEntity couponTenantEntity = new TenantEntity(); + couponTenantEntity.setTenantId(msg.getTenantId()); + couponTenantEntity.setParentTenantId(msg.getParentTenantId()); + + WxCouponOrder couponOrder = couponOrderService.getById(msg.getCouponOrderId(),couponTenantEntity.getTenantId()); if(couponOrder == null) { logger.error("券包ID未找到: " + msg.getCouponOrderId()); throw new MallinkException(ErrorCode.COUPON_ORDER_IS_NULL.getCode(), "券包ID未找到" + msg.getCouponOrderId()); @@ -49,16 +54,10 @@ public class FmInsideCouponVerifyMsgServiceImpl implements MsgSendService { logger.error("门店未找到: " + msg.getMerchantId()); throw new MallinkException(ErrorCode.USER_IS_EMPTY.getCode(), "门店未找到" + msg.getMerchantId()); } - WxMerchant bmerchant = null; - if(msg.getBmerchantId() != null && msg.getBmerchantId().longValue() > 0l - && !msg.getBmerchantId().equals(msg.getMerchantId())){ - bmerchant = merchantService.selectById(msg.getBmerchantId()); - }else{ - bmerchant = merchant; - } + orderService.sendInsideOrderPushDeliveryMsg(couponOrder,null,couponOrder.getId()); // orderService.sendInsideOrderPushMsg(couponOrder,couponOrder.getComposeOrderId()); - couponOrderService.actionAfterVerify(couponOrder, merchant, bmerchant); + couponOrderService.actionAfterVerify(couponOrder, merchant); } }