diff --git a/mallinkAdmin/src/main/resources/db/migration/V2022111500001__plat_coupon.sql b/mallinkAdmin/src/main/resources/db/migration/V2022111500001__plat_coupon.sql index 12bad6c0e..3b6d8cb11 100644 --- a/mallinkAdmin/src/main/resources/db/migration/V2022111500001__plat_coupon.sql +++ b/mallinkAdmin/src/main/resources/db/migration/V2022111500001__plat_coupon.sql @@ -316,6 +316,207 @@ ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `b_ ALTER TABLE `mallink`.`wx_coupon_order_99` ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `b_merchant_id`; +ALTER TABLE `mallink`.`wx_merchant_subsidy_0` +ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`; +ALTER TABLE `mallink`.`wx_merchant_subsidy_1` +ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`; +ALTER TABLE `mallink`.`wx_merchant_subsidy_2` +ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`; +ALTER TABLE `mallink`.`wx_merchant_subsidy_3` +ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`; +ALTER TABLE `mallink`.`wx_merchant_subsidy_4` +ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`; +ALTER TABLE `mallink`.`wx_merchant_subsidy_5` +ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`; +ALTER TABLE `mallink`.`wx_merchant_subsidy_6` +ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`; +ALTER TABLE `mallink`.`wx_merchant_subsidy_7` +ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`; +ALTER TABLE `mallink`.`wx_merchant_subsidy_8` +ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`; +ALTER TABLE `mallink`.`wx_merchant_subsidy_9` +ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`; +ALTER TABLE `mallink`.`wx_merchant_subsidy_10` +ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`; +ALTER TABLE `mallink`.`wx_merchant_subsidy_11` +ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`; +ALTER TABLE `mallink`.`wx_merchant_subsidy_12` +ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`; +ALTER TABLE `mallink`.`wx_merchant_subsidy_13` +ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`; +ALTER TABLE `mallink`.`wx_merchant_subsidy_14` +ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`; +ALTER TABLE `mallink`.`wx_merchant_subsidy_15` +ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`; +ALTER TABLE `mallink`.`wx_merchant_subsidy_16` +ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`; +ALTER TABLE `mallink`.`wx_merchant_subsidy_17` +ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`; +ALTER TABLE `mallink`.`wx_merchant_subsidy_18` +ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`; +ALTER TABLE `mallink`.`wx_merchant_subsidy_19` +ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`; +ALTER TABLE `mallink`.`wx_merchant_subsidy_20` +ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`; +ALTER TABLE `mallink`.`wx_merchant_subsidy_21` +ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`; +ALTER TABLE `mallink`.`wx_merchant_subsidy_22` +ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`; +ALTER TABLE `mallink`.`wx_merchant_subsidy_23` +ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`; +ALTER TABLE `mallink`.`wx_merchant_subsidy_24` +ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`; +ALTER TABLE `mallink`.`wx_merchant_subsidy_25` +ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`; +ALTER TABLE `mallink`.`wx_merchant_subsidy_26` +ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`; +ALTER TABLE `mallink`.`wx_merchant_subsidy_27` +ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`; +ALTER TABLE `mallink`.`wx_merchant_subsidy_28` +ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`; +ALTER TABLE `mallink`.`wx_merchant_subsidy_29` +ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`; +ALTER TABLE `mallink`.`wx_merchant_subsidy_30` +ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`; +ALTER TABLE `mallink`.`wx_merchant_subsidy_31` +ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`; +ALTER TABLE `mallink`.`wx_merchant_subsidy_32` +ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`; +ALTER TABLE `mallink`.`wx_merchant_subsidy_33` +ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`; +ALTER TABLE `mallink`.`wx_merchant_subsidy_34` +ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`; +ALTER TABLE `mallink`.`wx_merchant_subsidy_35` +ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`; +ALTER TABLE `mallink`.`wx_merchant_subsidy_36` +ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`; +ALTER TABLE `mallink`.`wx_merchant_subsidy_37` +ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`; +ALTER TABLE `mallink`.`wx_merchant_subsidy_38` +ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`; +ALTER TABLE `mallink`.`wx_merchant_subsidy_39` +ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`; +ALTER TABLE `mallink`.`wx_merchant_subsidy_40` +ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`; +ALTER TABLE `mallink`.`wx_merchant_subsidy_41` +ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`; +ALTER TABLE `mallink`.`wx_merchant_subsidy_42` +ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`; +ALTER TABLE `mallink`.`wx_merchant_subsidy_43` +ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`; +ALTER TABLE `mallink`.`wx_merchant_subsidy_44` +ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`; +ALTER TABLE `mallink`.`wx_merchant_subsidy_45` +ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`; +ALTER TABLE `mallink`.`wx_merchant_subsidy_46` +ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`; +ALTER TABLE `mallink`.`wx_merchant_subsidy_47` +ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`; +ALTER TABLE `mallink`.`wx_merchant_subsidy_48` +ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`; +ALTER TABLE `mallink`.`wx_merchant_subsidy_49` +ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`; +ALTER TABLE `mallink`.`wx_merchant_subsidy_50` +ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`; +ALTER TABLE `mallink`.`wx_merchant_subsidy_51` +ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`; +ALTER TABLE `mallink`.`wx_merchant_subsidy_52` +ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`; +ALTER TABLE `mallink`.`wx_merchant_subsidy_53` +ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`; +ALTER TABLE `mallink`.`wx_merchant_subsidy_54` +ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`; +ALTER TABLE `mallink`.`wx_merchant_subsidy_55` +ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`; +ALTER TABLE `mallink`.`wx_merchant_subsidy_56` +ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`; +ALTER TABLE `mallink`.`wx_merchant_subsidy_57` +ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`; +ALTER TABLE `mallink`.`wx_merchant_subsidy_58` +ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`; +ALTER TABLE `mallink`.`wx_merchant_subsidy_59` +ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`; +ALTER TABLE `mallink`.`wx_merchant_subsidy_60` +ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`; +ALTER TABLE `mallink`.`wx_merchant_subsidy_61` +ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`; +ALTER TABLE `mallink`.`wx_merchant_subsidy_62` +ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`; +ALTER TABLE `mallink`.`wx_merchant_subsidy_63` +ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`; +ALTER TABLE `mallink`.`wx_merchant_subsidy_64` +ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`; +ALTER TABLE `mallink`.`wx_merchant_subsidy_65` +ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`; +ALTER TABLE `mallink`.`wx_merchant_subsidy_66` +ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`; +ALTER TABLE `mallink`.`wx_merchant_subsidy_67` +ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`; +ALTER TABLE `mallink`.`wx_merchant_subsidy_68` +ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`; +ALTER TABLE `mallink`.`wx_merchant_subsidy_69` +ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`; +ALTER TABLE `mallink`.`wx_merchant_subsidy_70` +ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`; +ALTER TABLE `mallink`.`wx_merchant_subsidy_71` +ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`; +ALTER TABLE `mallink`.`wx_merchant_subsidy_72` +ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`; +ALTER TABLE `mallink`.`wx_merchant_subsidy_73` +ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`; +ALTER TABLE `mallink`.`wx_merchant_subsidy_74` +ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`; +ALTER TABLE `mallink`.`wx_merchant_subsidy_75` +ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`; +ALTER TABLE `mallink`.`wx_merchant_subsidy_76` +ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`; +ALTER TABLE `mallink`.`wx_merchant_subsidy_77` +ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`; +ALTER TABLE `mallink`.`wx_merchant_subsidy_78` +ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`; +ALTER TABLE `mallink`.`wx_merchant_subsidy_79` +ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`; +ALTER TABLE `mallink`.`wx_merchant_subsidy_80` +ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`; +ALTER TABLE `mallink`.`wx_merchant_subsidy_81` +ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`; +ALTER TABLE `mallink`.`wx_merchant_subsidy_82` +ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`; +ALTER TABLE `mallink`.`wx_merchant_subsidy_83` +ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`; +ALTER TABLE `mallink`.`wx_merchant_subsidy_84` +ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`; +ALTER TABLE `mallink`.`wx_merchant_subsidy_85` +ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`; +ALTER TABLE `mallink`.`wx_merchant_subsidy_86` +ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`; +ALTER TABLE `mallink`.`wx_merchant_subsidy_87` +ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`; +ALTER TABLE `mallink`.`wx_merchant_subsidy_88` +ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`; +ALTER TABLE `mallink`.`wx_merchant_subsidy_89` +ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`; +ALTER TABLE `mallink`.`wx_merchant_subsidy_90` +ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`; +ALTER TABLE `mallink`.`wx_merchant_subsidy_91` +ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`; +ALTER TABLE `mallink`.`wx_merchant_subsidy_92` +ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`; +ALTER TABLE `mallink`.`wx_merchant_subsidy_93` +ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`; +ALTER TABLE `mallink`.`wx_merchant_subsidy_94` +ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`; +ALTER TABLE `mallink`.`wx_merchant_subsidy_95` +ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`; +ALTER TABLE `mallink`.`wx_merchant_subsidy_96` +ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`; +ALTER TABLE `mallink`.`wx_merchant_subsidy_97` +ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`; +ALTER TABLE `mallink`.`wx_merchant_subsidy_98` +ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`; +ALTER TABLE `mallink`.`wx_merchant_subsidy_99` +ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`; + ALTER TABLE `mallink`.`wx_profit_sharing_order_0` ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`; ALTER TABLE `mallink`.`wx_profit_sharing_order_1` diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantSubsidy.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantSubsidy.java index 955187786..4e9e04848 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantSubsidy.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantSubsidy.java @@ -39,6 +39,9 @@ public class WxMerchantSubsidy extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value="商户ID",name="merchantId") private Long merchantId; + @io.swagger.annotations.ApiModelProperty(value = "b端核销商场tenantId", name = "bTenantId") + private String bTenantId; + @io.swagger.annotations.ApiModelProperty(value="券包ID/存储卡ID",name="couponOrderId") private Long couponOrderId; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java index aa4a03afd..f57def1b9 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java @@ -220,6 +220,7 @@ public class WxCardSpendServiceImpl implements WxCardSpendService { merchantSubsidy.setOrderId(order.getId()); merchantSubsidy.setOrderType(EnumOrderType.PREPAIDCARD.getCode()); merchantSubsidy.setMerchantId(record.getMerchantId()); + merchantSubsidy.setBTenantId(record.getTenantId()); merchantSubsidy.setCouponOrderId(cardInfo.getId()); merchantSubsidy.setCouponType(EnumCouponType.CARD_MULTIMCH.getCode()); merchantSubsidy.setOrderPayment(record.getDeductionAmount()); @@ -341,6 +342,7 @@ public class WxCardSpendServiceImpl implements WxCardSpendService { merchantSubsidy.setOrderId(record.getOrderId()); merchantSubsidy.setOrderType(EnumOrderType.PREPAIDCARD.getCode()); merchantSubsidy.setMerchantId(record.getMerchantId()); + merchantSubsidy.setBTenantId(record.getTenantId()); merchantSubsidy.setCouponOrderId(record.getCardId()); merchantSubsidy.setCouponType(coupon.getType()); merchantSubsidy.setOrderPayment(record.getPayment()); @@ -864,6 +866,7 @@ public class WxCardSpendServiceImpl implements WxCardSpendService { merchantSubsidy.setOrderId(record.getOrderId()); merchantSubsidy.setOrderType(EnumOrderType.PREPAIDCARD.getCode()); merchantSubsidy.setMerchantId(record.getMerchantId()); + merchantSubsidy.setBTenantId(record.getTenantId()); merchantSubsidy.setCouponOrderId(cardInfo.getId()); merchantSubsidy.setCouponType(EnumCouponType.CARD_MULTIMCH.getCode()); merchantSubsidy.setOrderPayment(record.getDeductionAmount()); 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 397cff1c2..d9d2fec7c 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java @@ -1756,6 +1756,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { Date curDate = new Date(); merchantSubsidy.setId(idWorker.nextId()); merchantSubsidy.setMerchantId(wxMerchant.getId()); + merchantSubsidy.setBTenantId(wxMerchant.getTenantId()); merchantSubsidy.setOrderPayment(couponOrder.getCouponPrice()); merchantSubsidy.setReceiverPayment(couponOrder.getCouponPrice()); merchantSubsidy.setRealPayment(couponOrder.getCouponPrice()); @@ -1841,7 +1842,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { WxMerchantSubsidy subsidy = new WxMerchantSubsidy(); subsidy.setOrderId(couponOrder.getOrderId()); subsidy.setType(EnumMerchantSubsidyType.MANUAL.getCode()); - subsidy.updateTenantInfo(merchant); + subsidy.updateTenantInfo(couponOrder); List wmsList = wxMerchantSubsidyMapper.selectList(new QueryWrapper(subsidy)); if (wmsList.size() > 0) { logger.error("补贴已经入库: (orderId,type)-({},1)", couponOrder.getOrderId()); @@ -1897,7 +1898,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { merchantSubsidyQ.setCouponOrderId(couponOrder.getId()); merchantSubsidyQ.setCouponType(couponOrder.getCouponType()); merchantSubsidyQ.setType(EnumMerchantSubsidyType.MANUAL.getCode()); - merchantSubsidyQ.updateTenantInfo(merchant); + merchantSubsidyQ.updateTenantInfo(couponOrder); List msList = wxMerchantSubsidyMapper.selectList(new QueryWrapper(merchantSubsidyQ)); if (msList.size() > 0) { // 补贴已入库 @@ -1914,10 +1915,11 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { WxMerchantSubsidy merchantSubsidy = new WxMerchantSubsidy(); merchantSubsidy.setId(idWorker.nextId()); - merchantSubsidy.updateTenantInfo(merchant); + merchantSubsidy.updateTenantInfo(couponOrder); merchantSubsidy.setOrderId(couponOrder.getOrderId()); merchantSubsidy.setOrderType(EnumOrderType.COUPON.getCode()); merchantSubsidy.setMerchantId(merchant.getId()); + merchantSubsidy.setBTenantId(merchant.getTenantId()); merchantSubsidy.setCouponOrderId(couponOrder.getId()); merchantSubsidy.setCouponType(couponOrder.getCouponType()); merchantSubsidy.setOrderPayment(coupon.getPrice()); 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 c1ecdc837..9024e39e8 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java @@ -1262,6 +1262,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { merchantSubsidy.setOrderType(EnumOrderType.MICROPAY.getCode()); //WxMerchantBUser wxMerchantBUser = wxMerchantBUserMapper.selectById(order.getProductId()); merchantSubsidy.setMerchantId(user.getMerchantId()); + merchantSubsidy.setBTenantId(user.getTenantId()); merchantSubsidy.setCouponOrderId(0L); merchantSubsidy.setCouponType(0); if (null == record.getPayAmount()) { diff --git a/mallinkService/src/main/resources/mapper/WxMerchantSubsidyMapper.xml b/mallinkService/src/main/resources/mapper/WxMerchantSubsidyMapper.xml index aa8f96abf..6b44b2ca9 100644 --- a/mallinkService/src/main/resources/mapper/WxMerchantSubsidyMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMerchantSubsidyMapper.xml @@ -8,6 +8,7 @@ + @@ -26,7 +27,7 @@ - `id`,`tenant_id`,`parent_tenant_id`,`order_id`,`order_type`,`merchant_id`,`coupon_order_id`,`coupon_type`,`order_payment`,`receiver_payment`,`real_payment`,`subsidy`,`real_subsidy`,`status`,`create_date`,`update_date`,freeze,type,source,card_spend_list_show + `id`,`tenant_id`,`parent_tenant_id`,`order_id`,`order_type`,`merchant_id`,`b_tenant_id`,`coupon_order_id`,`coupon_type`,`order_payment`,`receiver_payment`,`real_payment`,`subsidy`,`real_subsidy`,`status`,`create_date`,`update_date`,freeze,type,source,card_spend_list_show @@ -48,7 +49,10 @@ and `merchant_id` = #{merchantId} - + + + and `b_tenant_id` = #{bTenantId} + and `coupon_order_id` = #{couponOrderId} @@ -131,6 +135,9 @@ and `merchant_id`=#{merchantId} + + and `b_tenant_id` = #{bTenantId} + and id in @@ -147,6 +154,7 @@ + @@ -177,7 +185,7 @@ - ms.`id`,ms.`tenant_id`,ms.`parent_tenant_id`,ms.`order_id`,ms.`order_type`,ms.`merchant_id`,ms.`coupon_order_id`,ms.`coupon_type`, + ms.`id`,ms.`tenant_id`,ms.`parent_tenant_id`,ms.`order_id`,ms.`order_type`,ms.`merchant_id`,ms.`b_tenant_id`,ms.`coupon_order_id`,ms.`coupon_type`, ms.`order_payment`,ms.`receiver_payment`,ms.`real_payment`, ms.`subsidy`,ms.`real_subsidy`,ms.`status`,ms.`create_date`,ms.`update_date`, c.`title`,c.`sub_title`,c.`unit`,m.`name`, @@ -203,6 +211,9 @@ and t.`merchant_id` = #{merchantId} + + and t.`b_tenant_id` = #{bTenantId} + and t.`coupon_order_id` = #{couponOrderId} @@ -271,6 +282,9 @@ and ms.`merchant_id` = #{merchantId} + + and ms.`b_tenant_id` = #{bTenantId} + and ms.`source` = #{source} @@ -314,6 +328,9 @@ and ms.`merchant_id` = #{merchantId} + + and ms.`b_tenant_id` = #{bTenantId} + and c.`title` like concat('%', #{title},'%') @@ -329,10 +346,5 @@ group by ms.`merchant_id` - - - - - - +