| @@ -1628,15 +1628,22 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { | |||||
| //券 | //券 | ||||
| merchantSubsidy.setSource(EnumMerchantSubsidySource.COUPON.getCode()); | merchantSubsidy.setSource(EnumMerchantSubsidySource.COUPON.getCode()); | ||||
| } | } | ||||
| merchantSubsidy.setOrderId(couponOrder.getOrderId()); | |||||
| merchantSubsidy.setOrderType(EnumOrderType.COUPON.getCode()); | |||||
| merchantSubsidy.setCouponOrderId(couponOrder.getId()); | |||||
| merchantSubsidy.setCouponType(couponOrder.getCouponType()); | |||||
| merchantSubsidy.setType(payServiceFactory.getPayShareAdapterService(couponOrder.getPayVendor()).getSubsidyType()); | |||||
| List<WxMerchantSubsidy> msList = wxMerchantSubsidyMapper.selectList(new QueryWrapper<WxMerchantSubsidy>(merchantSubsidy)); | |||||
| if (msList.size() > 0) { | |||||
| // 已记账 | |||||
| return msList.get(0); | |||||
| } | |||||
| final IdWorker idWorker = IdWorker.get(); | final IdWorker idWorker = IdWorker.get(); | ||||
| Date curDate = new Date(); | Date curDate = new Date(); | ||||
| merchantSubsidy.setId(idWorker.nextId()); | merchantSubsidy.setId(idWorker.nextId()); | ||||
| merchantSubsidy.updateTenantInfo(couponOrder); | merchantSubsidy.updateTenantInfo(couponOrder); | ||||
| merchantSubsidy.setOrderId(couponOrder.getOrderId()); | |||||
| merchantSubsidy.setOrderType(EnumOrderType.COUPON.getCode()); | |||||
| merchantSubsidy.setMerchantId(merchantId); | |||||
| merchantSubsidy.setCouponOrderId(couponOrder.getId()); | |||||
| merchantSubsidy.setCouponType(couponOrder.getCouponType()); | |||||
| merchantSubsidy.setMerchantId(merchantId); | |||||
| merchantSubsidy.setOrderPayment(couponOrder.getCouponPrice()); | merchantSubsidy.setOrderPayment(couponOrder.getCouponPrice()); | ||||
| merchantSubsidy.setReceiverPayment(couponOrder.getCouponPrice()); | merchantSubsidy.setReceiverPayment(couponOrder.getCouponPrice()); | ||||
| merchantSubsidy.setRealPayment(couponOrder.getCouponPrice()); | merchantSubsidy.setRealPayment(couponOrder.getCouponPrice()); | ||||