From 063c759b7ffdec5793ef7bd800e965aa0cfc30bf Mon Sep 17 00:00:00 2001 From: xhxu Date: Tue, 13 Dec 2022 14:27:32 +0800 Subject: [PATCH 1/2] //sharing --- .../V2022121300001__addSharingMerchantId.sql | 200 ++++++++++++++++++ .../domain/po/WxProfitSharingOrder.java | 4 +- .../domain/vo/WxProfitSharingOrderVo.java | 1 + .../impl/WxProfitSharingOrderServiceImpl.java | 10 +- .../mapper/WxProfitSharingOrderMapper.xml | 15 +- 5 files changed, 224 insertions(+), 6 deletions(-) create mode 100644 mallinkAdmin/src/main/resources/db/migration/V2022121300001__addSharingMerchantId.sql diff --git a/mallinkAdmin/src/main/resources/db/migration/V2022121300001__addSharingMerchantId.sql b/mallinkAdmin/src/main/resources/db/migration/V2022121300001__addSharingMerchantId.sql new file mode 100644 index 000000000..d2a442dbb --- /dev/null +++ b/mallinkAdmin/src/main/resources/db/migration/V2022121300001__addSharingMerchantId.sql @@ -0,0 +1,200 @@ +ALTER TABLE `mallink`.`wx_profit_sharing_order_0` +ADD COLUMN `sharing_merchant_id` bigint(20) COMMENT '实际到账商户' AFTER `pay_merchant_mch_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_1` +ADD COLUMN `sharing_merchant_id` bigint(20) COMMENT '实际到账商户' AFTER `pay_merchant_mch_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_2` +ADD COLUMN `sharing_merchant_id` bigint(20) COMMENT '实际到账商户' AFTER `pay_merchant_mch_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_3` +ADD COLUMN `sharing_merchant_id` bigint(20) COMMENT '实际到账商户' AFTER `pay_merchant_mch_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_4` +ADD COLUMN `sharing_merchant_id` bigint(20) COMMENT '实际到账商户' AFTER `pay_merchant_mch_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_5` +ADD COLUMN `sharing_merchant_id` bigint(20) COMMENT '实际到账商户' AFTER `pay_merchant_mch_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_6` +ADD COLUMN `sharing_merchant_id` bigint(20) COMMENT '实际到账商户' AFTER `pay_merchant_mch_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_7` +ADD COLUMN `sharing_merchant_id` bigint(20) COMMENT '实际到账商户' AFTER `pay_merchant_mch_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_8` +ADD COLUMN `sharing_merchant_id` bigint(20) COMMENT '实际到账商户' AFTER `pay_merchant_mch_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_9` +ADD COLUMN `sharing_merchant_id` bigint(20) COMMENT '实际到账商户' AFTER `pay_merchant_mch_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_10` +ADD COLUMN `sharing_merchant_id` bigint(20) COMMENT '实际到账商户' AFTER `pay_merchant_mch_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_11` +ADD COLUMN `sharing_merchant_id` bigint(20) COMMENT '实际到账商户' AFTER `pay_merchant_mch_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_12` +ADD COLUMN `sharing_merchant_id` bigint(20) COMMENT '实际到账商户' AFTER `pay_merchant_mch_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_13` +ADD COLUMN `sharing_merchant_id` bigint(20) COMMENT '实际到账商户' AFTER `pay_merchant_mch_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_14` +ADD COLUMN `sharing_merchant_id` bigint(20) COMMENT '实际到账商户' AFTER `pay_merchant_mch_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_15` +ADD COLUMN `sharing_merchant_id` bigint(20) COMMENT '实际到账商户' AFTER `pay_merchant_mch_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_16` +ADD COLUMN `sharing_merchant_id` bigint(20) COMMENT '实际到账商户' AFTER `pay_merchant_mch_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_17` +ADD COLUMN `sharing_merchant_id` bigint(20) COMMENT '实际到账商户' AFTER `pay_merchant_mch_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_18` +ADD COLUMN `sharing_merchant_id` bigint(20) COMMENT '实际到账商户' AFTER `pay_merchant_mch_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_19` +ADD COLUMN `sharing_merchant_id` bigint(20) COMMENT '实际到账商户' AFTER `pay_merchant_mch_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_20` +ADD COLUMN `sharing_merchant_id` bigint(20) COMMENT '实际到账商户' AFTER `pay_merchant_mch_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_21` +ADD COLUMN `sharing_merchant_id` bigint(20) COMMENT '实际到账商户' AFTER `pay_merchant_mch_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_22` +ADD COLUMN `sharing_merchant_id` bigint(20) COMMENT '实际到账商户' AFTER `pay_merchant_mch_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_23` +ADD COLUMN `sharing_merchant_id` bigint(20) COMMENT '实际到账商户' AFTER `pay_merchant_mch_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_24` +ADD COLUMN `sharing_merchant_id` bigint(20) COMMENT '实际到账商户' AFTER `pay_merchant_mch_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_25` +ADD COLUMN `sharing_merchant_id` bigint(20) COMMENT '实际到账商户' AFTER `pay_merchant_mch_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_26` +ADD COLUMN `sharing_merchant_id` bigint(20) COMMENT '实际到账商户' AFTER `pay_merchant_mch_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_27` +ADD COLUMN `sharing_merchant_id` bigint(20) COMMENT '实际到账商户' AFTER `pay_merchant_mch_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_28` +ADD COLUMN `sharing_merchant_id` bigint(20) COMMENT '实际到账商户' AFTER `pay_merchant_mch_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_29` +ADD COLUMN `sharing_merchant_id` bigint(20) COMMENT '实际到账商户' AFTER `pay_merchant_mch_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_30` +ADD COLUMN `sharing_merchant_id` bigint(20) COMMENT '实际到账商户' AFTER `pay_merchant_mch_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_31` +ADD COLUMN `sharing_merchant_id` bigint(20) COMMENT '实际到账商户' AFTER `pay_merchant_mch_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_32` +ADD COLUMN `sharing_merchant_id` bigint(20) COMMENT '实际到账商户' AFTER `pay_merchant_mch_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_33` +ADD COLUMN `sharing_merchant_id` bigint(20) COMMENT '实际到账商户' AFTER `pay_merchant_mch_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_34` +ADD COLUMN `sharing_merchant_id` bigint(20) COMMENT '实际到账商户' AFTER `pay_merchant_mch_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_35` +ADD COLUMN `sharing_merchant_id` bigint(20) COMMENT '实际到账商户' AFTER `pay_merchant_mch_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_36` +ADD COLUMN `sharing_merchant_id` bigint(20) COMMENT '实际到账商户' AFTER `pay_merchant_mch_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_37` +ADD COLUMN `sharing_merchant_id` bigint(20) COMMENT '实际到账商户' AFTER `pay_merchant_mch_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_38` +ADD COLUMN `sharing_merchant_id` bigint(20) COMMENT '实际到账商户' AFTER `pay_merchant_mch_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_39` +ADD COLUMN `sharing_merchant_id` bigint(20) COMMENT '实际到账商户' AFTER `pay_merchant_mch_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_40` +ADD COLUMN `sharing_merchant_id` bigint(20) COMMENT '实际到账商户' AFTER `pay_merchant_mch_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_41` +ADD COLUMN `sharing_merchant_id` bigint(20) COMMENT '实际到账商户' AFTER `pay_merchant_mch_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_42` +ADD COLUMN `sharing_merchant_id` bigint(20) COMMENT '实际到账商户' AFTER `pay_merchant_mch_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_43` +ADD COLUMN `sharing_merchant_id` bigint(20) COMMENT '实际到账商户' AFTER `pay_merchant_mch_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_44` +ADD COLUMN `sharing_merchant_id` bigint(20) COMMENT '实际到账商户' AFTER `pay_merchant_mch_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_45` +ADD COLUMN `sharing_merchant_id` bigint(20) COMMENT '实际到账商户' AFTER `pay_merchant_mch_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_46` +ADD COLUMN `sharing_merchant_id` bigint(20) COMMENT '实际到账商户' AFTER `pay_merchant_mch_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_47` +ADD COLUMN `sharing_merchant_id` bigint(20) COMMENT '实际到账商户' AFTER `pay_merchant_mch_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_48` +ADD COLUMN `sharing_merchant_id` bigint(20) COMMENT '实际到账商户' AFTER `pay_merchant_mch_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_49` +ADD COLUMN `sharing_merchant_id` bigint(20) COMMENT '实际到账商户' AFTER `pay_merchant_mch_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_50` +ADD COLUMN `sharing_merchant_id` bigint(20) COMMENT '实际到账商户' AFTER `pay_merchant_mch_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_51` +ADD COLUMN `sharing_merchant_id` bigint(20) COMMENT '实际到账商户' AFTER `pay_merchant_mch_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_52` +ADD COLUMN `sharing_merchant_id` bigint(20) COMMENT '实际到账商户' AFTER `pay_merchant_mch_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_53` +ADD COLUMN `sharing_merchant_id` bigint(20) COMMENT '实际到账商户' AFTER `pay_merchant_mch_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_54` +ADD COLUMN `sharing_merchant_id` bigint(20) COMMENT '实际到账商户' AFTER `pay_merchant_mch_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_55` +ADD COLUMN `sharing_merchant_id` bigint(20) COMMENT '实际到账商户' AFTER `pay_merchant_mch_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_56` +ADD COLUMN `sharing_merchant_id` bigint(20) COMMENT '实际到账商户' AFTER `pay_merchant_mch_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_57` +ADD COLUMN `sharing_merchant_id` bigint(20) COMMENT '实际到账商户' AFTER `pay_merchant_mch_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_58` +ADD COLUMN `sharing_merchant_id` bigint(20) COMMENT '实际到账商户' AFTER `pay_merchant_mch_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_59` +ADD COLUMN `sharing_merchant_id` bigint(20) COMMENT '实际到账商户' AFTER `pay_merchant_mch_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_60` +ADD COLUMN `sharing_merchant_id` bigint(20) COMMENT '实际到账商户' AFTER `pay_merchant_mch_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_61` +ADD COLUMN `sharing_merchant_id` bigint(20) COMMENT '实际到账商户' AFTER `pay_merchant_mch_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_62` +ADD COLUMN `sharing_merchant_id` bigint(20) COMMENT '实际到账商户' AFTER `pay_merchant_mch_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_63` +ADD COLUMN `sharing_merchant_id` bigint(20) COMMENT '实际到账商户' AFTER `pay_merchant_mch_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_64` +ADD COLUMN `sharing_merchant_id` bigint(20) COMMENT '实际到账商户' AFTER `pay_merchant_mch_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_65` +ADD COLUMN `sharing_merchant_id` bigint(20) COMMENT '实际到账商户' AFTER `pay_merchant_mch_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_66` +ADD COLUMN `sharing_merchant_id` bigint(20) COMMENT '实际到账商户' AFTER `pay_merchant_mch_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_67` +ADD COLUMN `sharing_merchant_id` bigint(20) COMMENT '实际到账商户' AFTER `pay_merchant_mch_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_68` +ADD COLUMN `sharing_merchant_id` bigint(20) COMMENT '实际到账商户' AFTER `pay_merchant_mch_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_69` +ADD COLUMN `sharing_merchant_id` bigint(20) COMMENT '实际到账商户' AFTER `pay_merchant_mch_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_70` +ADD COLUMN `sharing_merchant_id` bigint(20) COMMENT '实际到账商户' AFTER `pay_merchant_mch_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_71` +ADD COLUMN `sharing_merchant_id` bigint(20) COMMENT '实际到账商户' AFTER `pay_merchant_mch_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_72` +ADD COLUMN `sharing_merchant_id` bigint(20) COMMENT '实际到账商户' AFTER `pay_merchant_mch_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_73` +ADD COLUMN `sharing_merchant_id` bigint(20) COMMENT '实际到账商户' AFTER `pay_merchant_mch_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_74` +ADD COLUMN `sharing_merchant_id` bigint(20) COMMENT '实际到账商户' AFTER `pay_merchant_mch_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_75` +ADD COLUMN `sharing_merchant_id` bigint(20) COMMENT '实际到账商户' AFTER `pay_merchant_mch_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_76` +ADD COLUMN `sharing_merchant_id` bigint(20) COMMENT '实际到账商户' AFTER `pay_merchant_mch_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_77` +ADD COLUMN `sharing_merchant_id` bigint(20) COMMENT '实际到账商户' AFTER `pay_merchant_mch_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_78` +ADD COLUMN `sharing_merchant_id` bigint(20) COMMENT '实际到账商户' AFTER `pay_merchant_mch_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_79` +ADD COLUMN `sharing_merchant_id` bigint(20) COMMENT '实际到账商户' AFTER `pay_merchant_mch_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_80` +ADD COLUMN `sharing_merchant_id` bigint(20) COMMENT '实际到账商户' AFTER `pay_merchant_mch_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_81` +ADD COLUMN `sharing_merchant_id` bigint(20) COMMENT '实际到账商户' AFTER `pay_merchant_mch_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_82` +ADD COLUMN `sharing_merchant_id` bigint(20) COMMENT '实际到账商户' AFTER `pay_merchant_mch_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_83` +ADD COLUMN `sharing_merchant_id` bigint(20) COMMENT '实际到账商户' AFTER `pay_merchant_mch_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_84` +ADD COLUMN `sharing_merchant_id` bigint(20) COMMENT '实际到账商户' AFTER `pay_merchant_mch_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_85` +ADD COLUMN `sharing_merchant_id` bigint(20) COMMENT '实际到账商户' AFTER `pay_merchant_mch_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_86` +ADD COLUMN `sharing_merchant_id` bigint(20) COMMENT '实际到账商户' AFTER `pay_merchant_mch_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_87` +ADD COLUMN `sharing_merchant_id` bigint(20) COMMENT '实际到账商户' AFTER `pay_merchant_mch_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_88` +ADD COLUMN `sharing_merchant_id` bigint(20) COMMENT '实际到账商户' AFTER `pay_merchant_mch_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_89` +ADD COLUMN `sharing_merchant_id` bigint(20) COMMENT '实际到账商户' AFTER `pay_merchant_mch_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_90` +ADD COLUMN `sharing_merchant_id` bigint(20) COMMENT '实际到账商户' AFTER `pay_merchant_mch_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_91` +ADD COLUMN `sharing_merchant_id` bigint(20) COMMENT '实际到账商户' AFTER `pay_merchant_mch_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_92` +ADD COLUMN `sharing_merchant_id` bigint(20) COMMENT '实际到账商户' AFTER `pay_merchant_mch_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_93` +ADD COLUMN `sharing_merchant_id` bigint(20) COMMENT '实际到账商户' AFTER `pay_merchant_mch_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_94` +ADD COLUMN `sharing_merchant_id` bigint(20) COMMENT '实际到账商户' AFTER `pay_merchant_mch_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_95` +ADD COLUMN `sharing_merchant_id` bigint(20) COMMENT '实际到账商户' AFTER `pay_merchant_mch_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_96` +ADD COLUMN `sharing_merchant_id` bigint(20) COMMENT '实际到账商户' AFTER `pay_merchant_mch_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_97` +ADD COLUMN `sharing_merchant_id` bigint(20) COMMENT '实际到账商户' AFTER `pay_merchant_mch_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_98` +ADD COLUMN `sharing_merchant_id` bigint(20) COMMENT '实际到账商户' AFTER `pay_merchant_mch_id`; +ALTER TABLE `mallink`.`wx_profit_sharing_order_99` +ADD COLUMN `sharing_merchant_id` bigint(20) COMMENT '实际到账商户' AFTER `pay_merchant_mch_id`; \ No newline at end of file diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxProfitSharingOrder.java b/mallinkService/src/main/java/com/iformall/domain/po/WxProfitSharingOrder.java index b3bd63d29..83c7fcefd 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxProfitSharingOrder.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxProfitSharingOrder.java @@ -23,7 +23,9 @@ public class WxProfitSharingOrder extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value="支付时收款商户,直连模式必须有",name="payMerchantId") private Long payMerchantId; @io.swagger.annotations.ApiModelProperty(value="支付时收款商户平台账号,直连模式必须有",name="payMerchantMchId") - private String payMerchantMchId; + private String payMerchantMchId; + @io.swagger.annotations.ApiModelProperty(value="实际到账商户",name="sharingMerchantId") + private Long sharingMerchantId; @io.swagger.annotations.ApiModelProperty(value="支付订单ID",name="wxPayOrderId") private Long orderId; @io.swagger.annotations.ApiModelProperty(value="支付渠道: (抖音分账用)",name="payVendor") diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxProfitSharingOrderVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxProfitSharingOrderVo.java index 51a7cdae8..ee944d3cd 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxProfitSharingOrderVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxProfitSharingOrderVo.java @@ -22,6 +22,7 @@ public class WxProfitSharingOrderVo extends TenantEntity { private String payMerchantMchId; private Long merchantId; private String mchId; + private Long sharingMerchantId; @Excel(name="商户名称",width = 20,orderNum = "2") private String merchantName; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingOrderServiceImpl.java index bd5a2a5dd..c39ef6c5d 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingOrderServiceImpl.java @@ -379,6 +379,11 @@ public class WxProfitSharingOrderServiceImpl implements WxProfitSharingOrderServ WxProfitSharingOrder updSharingOrder = new WxProfitSharingOrder(); updSharingOrder.updateTenantInfo(sharingOrder); updSharingOrder.setId(sharingOrder.getId()); + if(isSharingResult){ + updSharingOrder.setSharingMerchantId(sharingOrder.getPayMerchantId()); + }else{ + updSharingOrder.setSharingMerchantId(sharingOrder.getMerchantId()); + } updSharingOrder.setOutSettleNo(sharingOrder.getOutSettleNo()); updSharingOrder.setUpdateTime(currentDate); @@ -399,6 +404,7 @@ public class WxProfitSharingOrderServiceImpl implements WxProfitSharingOrderServ WxProfitSharingOrder updSharingOrder = new WxProfitSharingOrder(); updSharingOrder.updateTenantInfo(sharingOrder); updSharingOrder.setId(sharingOrder.getId()); + updSharingOrder.setSharingMerchantId(sharingOrder.getPayMerchantId()); updSharingOrder.setSharingStatus(EnumProfitSharingOrderStatus.PROFIT_SHARING_DONE.getCode()); updSharingOrder.setErrorMsg("微信支付超30天已自动解冻"); updSharingOrder.setPointDeduction(JSON.toJSONString(wxComposeChildOrderShare)); @@ -418,7 +424,7 @@ public class WxProfitSharingOrderServiceImpl implements WxProfitSharingOrderServ } if(isSharingResult){ - if(EnumPayMchType.TOTAL.getCode().equals(payOrder.getMchType()) && EnumPayShare.NO.getCode().equals(payOrder.getShare())){ + if(EnumPayMchType.TOTAL.getCode().equals(payOrder.getMchType())){ //解冻给收款方(广场) JSONObject jo = new JSONObject(); jo.put("type",EnumProfitSharingReceiverType.PROFIT_SHARING_RECEIVER_MERCHANT_ID.getMessage()); @@ -517,6 +523,8 @@ public class WxProfitSharingOrderServiceImpl implements WxProfitSharingOrderServ } record.setPayMerchantId(childOrderShare.getMerchantId()); record.setPayMerchantMchId(childOrderShare.getMerchantUid()); + }else{ + record.setPayMerchantId(0l); } record.setSharingStatus(EnumProfitSharingOrderStatus.PROFIT_SHARING_READY.getCode()); // record.setPointDeduction(JSON.toJSONString(childOrderShare)); diff --git a/mallinkService/src/main/resources/mapper/WxProfitSharingOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxProfitSharingOrderMapper.xml index d31c1de24..89910be78 100644 --- a/mallinkService/src/main/resources/mapper/WxProfitSharingOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxProfitSharingOrderMapper.xml @@ -10,6 +10,7 @@ + @@ -31,7 +32,7 @@ - `id`,`tenant_id`,`parent_tenant_id`,`out_settle_no`,`merchant_id`,`b_tenant_id`,`pay_merchant_id`,`pay_merchant_mch_id`,`order_id`,`pay_vendor`,`pay_version`,`mch_type`,`pay_amount`, + `id`,`tenant_id`,`parent_tenant_id`,`out_settle_no`,`merchant_id`,`b_tenant_id`,`pay_merchant_id`,`pay_merchant_mch_id`,`sharing_merchant_id`,`order_id`,`pay_vendor`,`pay_version`,`mch_type`,`pay_amount`, `single_order_amount`,`single_order_id`,`pay_time_end`,`pay_time_start`,`transaction_id`,`sharing_order_no`,`type`,`point_deduction`,`receivers`,`error_msg`,`sharing_status`,`update_time`,`create_time` @@ -65,8 +66,12 @@ and `pay_merchant_mch_id` = #{payMerchantMchId} - - + + + + and `sharing_merchant_id` = #{sharingMerchantId} + + and `order_id` = #{orderId} @@ -161,6 +166,7 @@ + @@ -180,7 +186,8 @@ - - - + @@ -168,6 +166,7 @@ + @@ -184,11 +183,13 @@ +