|
|
|
@@ -1274,7 +1274,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { |
|
|
|
if(EnumCouponVerifyType.VERIFY_B.equals(couponVerifyType) && !verifyMerchant(bUser,cm.getMerchantId())){ |
|
|
|
throw new MallinkException(ErrorCode.VERIFY_COUPON_ORDER_MERCHANT_IS_NULL); |
|
|
|
} |
|
|
|
merchantId = bUser.getMerchantId(); |
|
|
|
merchantId = cm.getMerchantId(); |
|
|
|
}else if(EnumCouponType.COUPON_GIFT.getCode().equals(wxCoupon.getType())){ |
|
|
|
if (StringUtils.isBlank(wxCoupon.getGiftList())){ |
|
|
|
logger.error("券包: coupon-" + wxCoupon.getId() + "数据异常" + "couponOrder-" + couponOrder.getId()); |
|
|
|
@@ -1309,8 +1309,9 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { |
|
|
|
&& EnumPayShare.YES.getCode().equals(wxPayOrder.getShare())){ |
|
|
|
payServiceFactory.getPayShareAdapterService(wxPayOrder.getPayVendor()) |
|
|
|
.getReceiverList(couponOrder, merchantId, wxPayOrder.getTtPayWay()); |
|
|
|
}else if(wxPayOrder != null && EnumPayMchType.DIRECT.getCode().equals(wxPayOrder.getMchType())){ |
|
|
|
merchantId = wxPayOrder.getChildOrderShare(couponOrder.getOrderId()).getMerchantId(); |
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
int num = 0; |
|
|
|
@@ -1444,7 +1445,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { |
|
|
|
} |
|
|
|
|
|
|
|
if (couponOrder != null && couponOrder.getMerchantId() != null) { |
|
|
|
this.sendInsideCouponVerifyMsg(couponOrder, couponOrderId, couponOrder.getMerchantId()); |
|
|
|
this.sendInsideCouponVerifyMsg(couponOrder, couponOrderId, couponOrder.getMerchantId(),couponOrder.getBMerchantId()); |
|
|
|
} |
|
|
|
|
|
|
|
return couponOrder; |
|
|
|
@@ -1567,17 +1568,21 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
public void sendInsideCouponVerifyMsg(TenantEntity tenantEntity, Long couponOrderId, Long merchantId) { |
|
|
|
public void sendInsideCouponVerifyMsg(TenantEntity tenantEntity, Long couponOrderId, Long merchantId, Long bmerchantId) { |
|
|
|
if(bmerchantId == null || bmerchantId.longValue() == 0l){ |
|
|
|
bmerchantId = merchantId; |
|
|
|
} |
|
|
|
FmInsideCouponVerifyMsg verifyMsg = new FmInsideCouponVerifyMsg(); |
|
|
|
verifyMsg.setMsgType(EnumMsgRecordType.INSIDE_COUPON_VERIFY.getCode()); |
|
|
|
verifyMsg.updateTenantInfo(tenantEntity); |
|
|
|
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) { |
|
|
|
public void actionAfterVerify(WxCouponOrder couponOrder, WxMerchant merchant, WxMerchant bmerchant) { |
|
|
|
|
|
|
|
try { |
|
|
|
boolean mulityShare = true; |
|
|
|
@@ -1600,7 +1605,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { |
|
|
|
|
|
|
|
try { |
|
|
|
// 核销补贴 |
|
|
|
subsidyAfterVerify(couponOrder, merchant.getId()); |
|
|
|
subsidyAfterVerify(couponOrder, bmerchant.getId()); |
|
|
|
} catch (Exception e) { |
|
|
|
logger.error("核销记账失败"+e.getMessage(),e); |
|
|
|
} |
|
|
|
@@ -1614,7 +1619,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { |
|
|
|
} |
|
|
|
// 核销发模板消息 |
|
|
|
try { |
|
|
|
sendVerifyMsg(couponOrder, merchant, bSentCoupon); |
|
|
|
sendVerifyMsg(couponOrder, bmerchant, bSentCoupon); |
|
|
|
} catch (Exception e) { |
|
|
|
logger.error("核销发送消息发生错误:" + e.getMessage(),e); |
|
|
|
} |
|
|
|
|