Browse Source

//subsidy

release_toaliyun_real
xhxu 3 years ago
parent
commit
d1955c7ae9
6 changed files with 234 additions and 12 deletions
  1. +201
    -0
      mallinkAdmin/src/main/resources/db/migration/V2022111500001__plat_coupon.sql
  2. +3
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxMerchantSubsidy.java
  3. +3
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java
  4. +5
    -3
      mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java
  5. +1
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java
  6. +21
    -9
      mallinkService/src/main/resources/mapper/WxMerchantSubsidyMapper.xml

+ 201
- 0
mallinkAdmin/src/main/resources/db/migration/V2022111500001__plat_coupon.sql View File

@@ -316,6 +316,207 @@ ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `b_
ALTER TABLE `mallink`.`wx_coupon_order_99` ALTER TABLE `mallink`.`wx_coupon_order_99`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `b_merchant_id`; 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` ALTER TABLE `mallink`.`wx_profit_sharing_order_0`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`; ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_1` ALTER TABLE `mallink`.`wx_profit_sharing_order_1`


+ 3
- 0
mallinkService/src/main/java/com/iformall/domain/po/WxMerchantSubsidy.java View File

@@ -39,6 +39,9 @@ public class WxMerchantSubsidy extends TenantEntity {
@io.swagger.annotations.ApiModelProperty(value="商户ID",name="merchantId") @io.swagger.annotations.ApiModelProperty(value="商户ID",name="merchantId")
private Long 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") @io.swagger.annotations.ApiModelProperty(value="券包ID/存储卡ID",name="couponOrderId")
private Long couponOrderId; private Long couponOrderId;




+ 3
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java View File

@@ -220,6 +220,7 @@ public class WxCardSpendServiceImpl implements WxCardSpendService {
merchantSubsidy.setOrderId(order.getId()); merchantSubsidy.setOrderId(order.getId());
merchantSubsidy.setOrderType(EnumOrderType.PREPAIDCARD.getCode()); merchantSubsidy.setOrderType(EnumOrderType.PREPAIDCARD.getCode());
merchantSubsidy.setMerchantId(record.getMerchantId()); merchantSubsidy.setMerchantId(record.getMerchantId());
merchantSubsidy.setBTenantId(record.getTenantId());
merchantSubsidy.setCouponOrderId(cardInfo.getId()); merchantSubsidy.setCouponOrderId(cardInfo.getId());
merchantSubsidy.setCouponType(EnumCouponType.CARD_MULTIMCH.getCode()); merchantSubsidy.setCouponType(EnumCouponType.CARD_MULTIMCH.getCode());
merchantSubsidy.setOrderPayment(record.getDeductionAmount()); merchantSubsidy.setOrderPayment(record.getDeductionAmount());
@@ -341,6 +342,7 @@ public class WxCardSpendServiceImpl implements WxCardSpendService {
merchantSubsidy.setOrderId(record.getOrderId()); merchantSubsidy.setOrderId(record.getOrderId());
merchantSubsidy.setOrderType(EnumOrderType.PREPAIDCARD.getCode()); merchantSubsidy.setOrderType(EnumOrderType.PREPAIDCARD.getCode());
merchantSubsidy.setMerchantId(record.getMerchantId()); merchantSubsidy.setMerchantId(record.getMerchantId());
merchantSubsidy.setBTenantId(record.getTenantId());
merchantSubsidy.setCouponOrderId(record.getCardId()); merchantSubsidy.setCouponOrderId(record.getCardId());
merchantSubsidy.setCouponType(coupon.getType()); merchantSubsidy.setCouponType(coupon.getType());
merchantSubsidy.setOrderPayment(record.getPayment()); merchantSubsidy.setOrderPayment(record.getPayment());
@@ -864,6 +866,7 @@ public class WxCardSpendServiceImpl implements WxCardSpendService {
merchantSubsidy.setOrderId(record.getOrderId()); merchantSubsidy.setOrderId(record.getOrderId());
merchantSubsidy.setOrderType(EnumOrderType.PREPAIDCARD.getCode()); merchantSubsidy.setOrderType(EnumOrderType.PREPAIDCARD.getCode());
merchantSubsidy.setMerchantId(record.getMerchantId()); merchantSubsidy.setMerchantId(record.getMerchantId());
merchantSubsidy.setBTenantId(record.getTenantId());
merchantSubsidy.setCouponOrderId(cardInfo.getId()); merchantSubsidy.setCouponOrderId(cardInfo.getId());
merchantSubsidy.setCouponType(EnumCouponType.CARD_MULTIMCH.getCode()); merchantSubsidy.setCouponType(EnumCouponType.CARD_MULTIMCH.getCode());
merchantSubsidy.setOrderPayment(record.getDeductionAmount()); merchantSubsidy.setOrderPayment(record.getDeductionAmount());


+ 5
- 3
mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java View File

@@ -1756,6 +1756,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService {
Date curDate = new Date(); Date curDate = new Date();
merchantSubsidy.setId(idWorker.nextId()); merchantSubsidy.setId(idWorker.nextId());
merchantSubsidy.setMerchantId(wxMerchant.getId()); merchantSubsidy.setMerchantId(wxMerchant.getId());
merchantSubsidy.setBTenantId(wxMerchant.getTenantId());
merchantSubsidy.setOrderPayment(couponOrder.getCouponPrice()); merchantSubsidy.setOrderPayment(couponOrder.getCouponPrice());
merchantSubsidy.setReceiverPayment(couponOrder.getCouponPrice()); merchantSubsidy.setReceiverPayment(couponOrder.getCouponPrice());
merchantSubsidy.setRealPayment(couponOrder.getCouponPrice()); merchantSubsidy.setRealPayment(couponOrder.getCouponPrice());
@@ -1841,7 +1842,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService {
WxMerchantSubsidy subsidy = new WxMerchantSubsidy(); WxMerchantSubsidy subsidy = new WxMerchantSubsidy();
subsidy.setOrderId(couponOrder.getOrderId()); subsidy.setOrderId(couponOrder.getOrderId());
subsidy.setType(EnumMerchantSubsidyType.MANUAL.getCode()); subsidy.setType(EnumMerchantSubsidyType.MANUAL.getCode());
subsidy.updateTenantInfo(merchant);
subsidy.updateTenantInfo(couponOrder);
List<WxMerchantSubsidy> wmsList = wxMerchantSubsidyMapper.selectList(new QueryWrapper(subsidy)); List<WxMerchantSubsidy> wmsList = wxMerchantSubsidyMapper.selectList(new QueryWrapper(subsidy));
if (wmsList.size() > 0) { if (wmsList.size() > 0) {
logger.error("补贴已经入库: (orderId,type)-({},1)", couponOrder.getOrderId()); logger.error("补贴已经入库: (orderId,type)-({},1)", couponOrder.getOrderId());
@@ -1897,7 +1898,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService {
merchantSubsidyQ.setCouponOrderId(couponOrder.getId()); merchantSubsidyQ.setCouponOrderId(couponOrder.getId());
merchantSubsidyQ.setCouponType(couponOrder.getCouponType()); merchantSubsidyQ.setCouponType(couponOrder.getCouponType());
merchantSubsidyQ.setType(EnumMerchantSubsidyType.MANUAL.getCode()); merchantSubsidyQ.setType(EnumMerchantSubsidyType.MANUAL.getCode());
merchantSubsidyQ.updateTenantInfo(merchant);
merchantSubsidyQ.updateTenantInfo(couponOrder);
List<WxMerchantSubsidy> msList = wxMerchantSubsidyMapper.selectList(new QueryWrapper<WxMerchantSubsidy>(merchantSubsidyQ)); List<WxMerchantSubsidy> msList = wxMerchantSubsidyMapper.selectList(new QueryWrapper<WxMerchantSubsidy>(merchantSubsidyQ));
if (msList.size() > 0) { if (msList.size() > 0) {
// 补贴已入库 // 补贴已入库
@@ -1914,10 +1915,11 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService {


WxMerchantSubsidy merchantSubsidy = new WxMerchantSubsidy(); WxMerchantSubsidy merchantSubsidy = new WxMerchantSubsidy();
merchantSubsidy.setId(idWorker.nextId()); merchantSubsidy.setId(idWorker.nextId());
merchantSubsidy.updateTenantInfo(merchant);
merchantSubsidy.updateTenantInfo(couponOrder);
merchantSubsidy.setOrderId(couponOrder.getOrderId()); merchantSubsidy.setOrderId(couponOrder.getOrderId());
merchantSubsidy.setOrderType(EnumOrderType.COUPON.getCode()); merchantSubsidy.setOrderType(EnumOrderType.COUPON.getCode());
merchantSubsidy.setMerchantId(merchant.getId()); merchantSubsidy.setMerchantId(merchant.getId());
merchantSubsidy.setBTenantId(merchant.getTenantId());
merchantSubsidy.setCouponOrderId(couponOrder.getId()); merchantSubsidy.setCouponOrderId(couponOrder.getId());
merchantSubsidy.setCouponType(couponOrder.getCouponType()); merchantSubsidy.setCouponType(couponOrder.getCouponType());
merchantSubsidy.setOrderPayment(coupon.getPrice()); merchantSubsidy.setOrderPayment(coupon.getPrice());


+ 1
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java View File

@@ -1262,6 +1262,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService {
merchantSubsidy.setOrderType(EnumOrderType.MICROPAY.getCode()); merchantSubsidy.setOrderType(EnumOrderType.MICROPAY.getCode());
//WxMerchantBUser wxMerchantBUser = wxMerchantBUserMapper.selectById(order.getProductId()); //WxMerchantBUser wxMerchantBUser = wxMerchantBUserMapper.selectById(order.getProductId());
merchantSubsidy.setMerchantId(user.getMerchantId()); merchantSubsidy.setMerchantId(user.getMerchantId());
merchantSubsidy.setBTenantId(user.getTenantId());
merchantSubsidy.setCouponOrderId(0L); merchantSubsidy.setCouponOrderId(0L);
merchantSubsidy.setCouponType(0); merchantSubsidy.setCouponType(0);
if (null == record.getPayAmount()) { if (null == record.getPayAmount()) {


+ 21
- 9
mallinkService/src/main/resources/mapper/WxMerchantSubsidyMapper.xml View File

@@ -8,6 +8,7 @@
<result column="order_id" jdbcType="BIGINT" property="orderId" /> <result column="order_id" jdbcType="BIGINT" property="orderId" />
<result column="order_type" jdbcType="INTEGER" property="orderType" /> <result column="order_type" jdbcType="INTEGER" property="orderType" />
<result column="merchant_id" jdbcType="BIGINT" property="merchantId" /> <result column="merchant_id" jdbcType="BIGINT" property="merchantId" />
<result column="b_tenant_id" jdbcType="VARCHAR" property="bTenantId" />
<result column="coupon_order_id" jdbcType="BIGINT" property="couponOrderId" /> <result column="coupon_order_id" jdbcType="BIGINT" property="couponOrderId" />
<result column="coupon_type" jdbcType="INTEGER" property="couponType" /> <result column="coupon_type" jdbcType="INTEGER" property="couponType" />
<result column="order_payment" jdbcType="INTEGER" property="orderPayment" /> <result column="order_payment" jdbcType="INTEGER" property="orderPayment" />
@@ -26,7 +27,7 @@
</resultMap> </resultMap>
<sql id="allColumns"> <sql id="allColumns">
`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
</sql> </sql>


<sql id="dynamicWhereConditions"> <sql id="dynamicWhereConditions">
@@ -48,7 +49,10 @@
</if> </if>
<if test=" null != merchantId "> <if test=" null != merchantId ">
and `merchant_id` = #{merchantId} and `merchant_id` = #{merchantId}
</if>
</if>
<if test=" null != bTenantId and '' != bTenantId">
and `b_tenant_id` = #{bTenantId}
</if>
<if test=" null != couponOrderId "> <if test=" null != couponOrderId ">
and `coupon_order_id` = #{couponOrderId} and `coupon_order_id` = #{couponOrderId}
</if> </if>
@@ -131,6 +135,9 @@
<if test=" null != merchantId "> <if test=" null != merchantId ">
and `merchant_id`=#{merchantId} and `merchant_id`=#{merchantId}
</if> </if>
<if test=" null != bTenantId and '' != bTenantId">
and `b_tenant_id` = #{bTenantId}
</if>
<if test=" null != ids "> <if test=" null != ids ">
and id in and id in
<foreach collection="ids" index="index" item="idItem" open="(" separator="," close=")"> <foreach collection="ids" index="index" item="idItem" open="(" separator="," close=")">
@@ -147,6 +154,7 @@
<result column="order_id" jdbcType="BIGINT" property="orderId" /> <result column="order_id" jdbcType="BIGINT" property="orderId" />
<result column="order_type" jdbcType="INTEGER" property="orderType" /> <result column="order_type" jdbcType="INTEGER" property="orderType" />
<result column="merchant_id" jdbcType="BIGINT" property="merchantId" /> <result column="merchant_id" jdbcType="BIGINT" property="merchantId" />
<result column="b_tenant_id" jdbcType="VARCHAR" property="bTenantId" />
<result column="coupon_order_id" jdbcType="BIGINT" property="couponOrderId" /> <result column="coupon_order_id" jdbcType="BIGINT" property="couponOrderId" />
<result column="coupon_type" jdbcType="INTEGER" property="couponType" /> <result column="coupon_type" jdbcType="INTEGER" property="couponType" />
<result column="order_payment" jdbcType="INTEGER" property="orderPayment" /> <result column="order_payment" jdbcType="INTEGER" property="orderPayment" />
@@ -177,7 +185,7 @@
</resultMap> </resultMap>


<sql id="allVoColumns"> <sql id="allVoColumns">
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.`order_payment`,ms.`receiver_payment`,ms.`real_payment`,
ms.`subsidy`,ms.`real_subsidy`,ms.`status`,ms.`create_date`,ms.`update_date`, ms.`subsidy`,ms.`real_subsidy`,ms.`status`,ms.`create_date`,ms.`update_date`,
c.`title`,c.`sub_title`,c.`unit`,m.`name`, c.`title`,c.`sub_title`,c.`unit`,m.`name`,
@@ -203,6 +211,9 @@
<if test=" null != merchantId "> <if test=" null != merchantId ">
and t.`merchant_id` = #{merchantId} and t.`merchant_id` = #{merchantId}
</if> </if>
<if test=" null != bTenantId and '' != bTenantId">
and t.`b_tenant_id` = #{bTenantId}
</if>
<if test=" null != couponOrderId "> <if test=" null != couponOrderId ">
and t.`coupon_order_id` = #{couponOrderId} and t.`coupon_order_id` = #{couponOrderId}
</if> </if>
@@ -271,6 +282,9 @@
<if test=" null != merchantId "> <if test=" null != merchantId ">
and ms.`merchant_id` = #{merchantId} and ms.`merchant_id` = #{merchantId}
</if> </if>
<if test=" null != bTenantId and '' != bTenantId">
and ms.`b_tenant_id` = #{bTenantId}
</if>
<if test=" null != source "> <if test=" null != source ">
and ms.`source` = #{source} and ms.`source` = #{source}
</if> </if>
@@ -314,6 +328,9 @@
<if test=" null != merchantId "> <if test=" null != merchantId ">
and ms.`merchant_id` = #{merchantId} and ms.`merchant_id` = #{merchantId}
</if> </if>
<if test=" null != bTenantId and '' != bTenantId">
and ms.`b_tenant_id` = #{bTenantId}
</if>
<if test=" null != title "> <if test=" null != title ">
and c.`title` like concat('%', #{title},'%') and c.`title` like concat('%', #{title},'%')
</if> </if>
@@ -329,10 +346,5 @@
</where> </where>
group by ms.`merchant_id` group by ms.`merchant_id`
</select> </select>

</mapper> </mapper>

Loading…
Cancel
Save