Просмотр исходного кода

Merge branch 'release_toaliyun_real_202211' of https://git.malls.iformall.com/server/formallProject into release_toaliyun_real_202211

release_toaliyun_real
zhengfangyuan 3 лет назад
Родитель
Сommit
fba47b8073
5 измененных файлов: 251 добавлений и 17 удалений
  1. +200
    -0
      mallinkAdmin/src/main/resources/db/migration/V2022121300001__addSharingMerchantId.sql
  2. +3
    -1
      mallinkService/src/main/java/com/iformall/domain/po/WxProfitSharingOrder.java
  3. +24
    -8
      mallinkService/src/main/java/com/iformall/domain/vo/WxProfitSharingOrderVo.java
  4. +9
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingOrderServiceImpl.java
  5. +15
    -7
      mallinkService/src/main/resources/mapper/WxProfitSharingOrderMapper.xml

+ 200
- 0
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`;

+ 3
- 1
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") @io.swagger.annotations.ApiModelProperty(value="支付时收款商户,直连模式必须有",name="payMerchantId")
private Long payMerchantId; private Long payMerchantId;
@io.swagger.annotations.ApiModelProperty(value="支付时收款商户平台账号,直连模式必须有",name="payMerchantMchId") @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") @io.swagger.annotations.ApiModelProperty(value="支付订单ID",name="wxPayOrderId")
private Long orderId; private Long orderId;
@io.swagger.annotations.ApiModelProperty(value="支付渠道: (抖音分账用)",name="payVendor") @io.swagger.annotations.ApiModelProperty(value="支付渠道: (抖音分账用)",name="payVendor")


+ 24
- 8
mallinkService/src/main/java/com/iformall/domain/vo/WxProfitSharingOrderVo.java Просмотреть файл

@@ -22,14 +22,30 @@ public class WxProfitSharingOrderVo extends TenantEntity {
private String payMerchantMchId; private String payMerchantMchId;
private Long merchantId; private Long merchantId;
private String mchId; private String mchId;
@Excel(name="商户名称",width = 20,orderNum = "2")
private String merchantName;
private Long sharingMerchantId;
@Excel(name="商户单号",width = 20,orderNum = "1") @Excel(name="商户单号",width = 20,orderNum = "1")
private Long orderId; private Long orderId;


@Excel(name="交易金额(分)",width = 20,orderNum = "3")
@Excel(name="商户名称",width = 20,orderNum = "2")
private String merchantName;

@Excel(name="收款商户",width = 20,orderNum = "3")
private String payMerchantName;

@Excel(name="到账商户",width = 20,orderNum = "4")
private String sharingMerchantName;

public String getSharingMerchantName(){
if(this.sharingMerchantId != null && this.sharingMerchantId.equals(this.merchantId)){
this.sharingMerchantName = this.merchantName;
}else if(this.sharingMerchantId != null && this.sharingMerchantId.equals(this.payMerchantId)){
this.sharingMerchantName = this.payMerchantName;
}
return sharingMerchantName;
}

@Excel(name="交易金额(分)",width = 20,orderNum = "5")
private Integer payAmount; private Integer payAmount;


@io.swagger.annotations.ApiModelProperty(value="订单ID",name="singleOrderId") @io.swagger.annotations.ApiModelProperty(value="订单ID",name="singleOrderId")
@@ -37,23 +53,23 @@ public class WxProfitSharingOrderVo extends TenantEntity {
@io.swagger.annotations.ApiModelProperty(value="单个订单分账总金额(分)",name="singleOrderAmount") @io.swagger.annotations.ApiModelProperty(value="单个订单分账总金额(分)",name="singleOrderAmount")
private Integer singleOrderAmount; private Integer singleOrderAmount;
@Excel(name="交易结束时间",exportFormat = "yyyy-MM-dd HH:mm:ss",width = 20,orderNum = "5")
@Excel(name="交易结束时间",exportFormat = "yyyy-MM-dd HH:mm:ss",width = 20,orderNum = "7")
private Date payTimeEnd; private Date payTimeEnd;
@Excel(name="交易开始时间",exportFormat = "yyyy-MM-dd HH:mm:ss",width = 20,orderNum = "4")
@Excel(name="交易开始时间",exportFormat = "yyyy-MM-dd HH:mm:ss",width = 20,orderNum = "6")
private Date payTimeStart; private Date payTimeStart;
private String transactionId; private String transactionId;
private String sharingOrderNo; private String sharingOrderNo;
@Excel(name="分账类型",width = 20,replace = { "单次分账_0", "多次分账_1", "完结分账(多次)_2", "完结分账(单次)_3"},orderNum = "6")
@Excel(name="分账类型",width = 20,replace = { "单次分账_0", "多次分账_1", "完结分账(多次)_2", "完结分账(单次)_3"},orderNum = "8")
private Integer type; private Integer type;
private String pointDeduction; private String pointDeduction;
private String receivers; private String receivers;
private String errorMsg; private String errorMsg;
@Excel(name="分账状态",width = 20,replace = { "未知_0", "提交订单失败_1", "提交业务失败_2", "受理成功_3", "处理中_4", "处理完成_5", "处理失败_6"},orderNum = "7")
@Excel(name="分账状态",width = 20,replace = { "未知_0", "提交订单失败_1", "提交业务失败_2", "受理成功_3", "处理中_4", "处理完成_5", "处理失败_6"},orderNum = "9")
private Integer sharingStatus; private Integer sharingStatus;
private Date updateTime; private Date updateTime;
private Date createTime; private Date createTime;


+ 9
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingOrderServiceImpl.java Просмотреть файл

@@ -379,6 +379,11 @@ public class WxProfitSharingOrderServiceImpl implements WxProfitSharingOrderServ
WxProfitSharingOrder updSharingOrder = new WxProfitSharingOrder(); WxProfitSharingOrder updSharingOrder = new WxProfitSharingOrder();
updSharingOrder.updateTenantInfo(sharingOrder); updSharingOrder.updateTenantInfo(sharingOrder);
updSharingOrder.setId(sharingOrder.getId()); updSharingOrder.setId(sharingOrder.getId());
if(isSharingResult){
updSharingOrder.setSharingMerchantId(sharingOrder.getPayMerchantId());
}else{
updSharingOrder.setSharingMerchantId(sharingOrder.getMerchantId());
}
updSharingOrder.setOutSettleNo(sharingOrder.getOutSettleNo()); updSharingOrder.setOutSettleNo(sharingOrder.getOutSettleNo());


updSharingOrder.setUpdateTime(currentDate); updSharingOrder.setUpdateTime(currentDate);
@@ -399,6 +404,7 @@ public class WxProfitSharingOrderServiceImpl implements WxProfitSharingOrderServ
WxProfitSharingOrder updSharingOrder = new WxProfitSharingOrder(); WxProfitSharingOrder updSharingOrder = new WxProfitSharingOrder();
updSharingOrder.updateTenantInfo(sharingOrder); updSharingOrder.updateTenantInfo(sharingOrder);
updSharingOrder.setId(sharingOrder.getId()); updSharingOrder.setId(sharingOrder.getId());
updSharingOrder.setSharingMerchantId(sharingOrder.getPayMerchantId());
updSharingOrder.setSharingStatus(EnumProfitSharingOrderStatus.PROFIT_SHARING_DONE.getCode()); updSharingOrder.setSharingStatus(EnumProfitSharingOrderStatus.PROFIT_SHARING_DONE.getCode());
updSharingOrder.setErrorMsg("微信支付超30天已自动解冻"); updSharingOrder.setErrorMsg("微信支付超30天已自动解冻");
updSharingOrder.setPointDeduction(JSON.toJSONString(wxComposeChildOrderShare)); updSharingOrder.setPointDeduction(JSON.toJSONString(wxComposeChildOrderShare));
@@ -418,7 +424,7 @@ public class WxProfitSharingOrderServiceImpl implements WxProfitSharingOrderServ
} }


if(isSharingResult){ 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(); JSONObject jo = new JSONObject();
jo.put("type",EnumProfitSharingReceiverType.PROFIT_SHARING_RECEIVER_MERCHANT_ID.getMessage()); jo.put("type",EnumProfitSharingReceiverType.PROFIT_SHARING_RECEIVER_MERCHANT_ID.getMessage());
@@ -517,6 +523,8 @@ public class WxProfitSharingOrderServiceImpl implements WxProfitSharingOrderServ
} }
record.setPayMerchantId(childOrderShare.getMerchantId()); record.setPayMerchantId(childOrderShare.getMerchantId());
record.setPayMerchantMchId(childOrderShare.getMerchantUid()); record.setPayMerchantMchId(childOrderShare.getMerchantUid());
}else{
record.setPayMerchantId(0l);
} }
record.setSharingStatus(EnumProfitSharingOrderStatus.PROFIT_SHARING_READY.getCode()); record.setSharingStatus(EnumProfitSharingOrderStatus.PROFIT_SHARING_READY.getCode());
// record.setPointDeduction(JSON.toJSONString(childOrderShare)); // record.setPointDeduction(JSON.toJSONString(childOrderShare));


+ 15
- 7
mallinkService/src/main/resources/mapper/WxProfitSharingOrderMapper.xml Просмотреть файл

@@ -10,6 +10,7 @@
<result column="b_tenant_id" jdbcType="VARCHAR" property="bTenantId" /> <result column="b_tenant_id" jdbcType="VARCHAR" property="bTenantId" />
<result column="pay_merchant_id" jdbcType="BIGINT" property="payMerchantId" /> <result column="pay_merchant_id" jdbcType="BIGINT" property="payMerchantId" />
<result column="pay_merchant_mch_id" jdbcType="VARCHAR" property="payMerchantMchId" /> <result column="pay_merchant_mch_id" jdbcType="VARCHAR" property="payMerchantMchId" />
<result column="sharing_merchant_id" jdbcType="BIGINT" property="sharingMerchantId" />
<result column="order_id" jdbcType="BIGINT" property="orderId" /> <result column="order_id" jdbcType="BIGINT" property="orderId" />
<result column="pay_vendor" jdbcType="INTEGER" property="payVendor"/> <result column="pay_vendor" jdbcType="INTEGER" property="payVendor"/>
<result column="pay_version" jdbcType="INTEGER" property="payVersion"/> <result column="pay_version" jdbcType="INTEGER" property="payVersion"/>
@@ -31,7 +32,7 @@
</resultMap> </resultMap>
<sql id="allColumns"> <sql id="allColumns">
`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` `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`
</sql> </sql>


@@ -65,8 +66,12 @@
<if test=" null != payMerchantMchId and '' != payMerchantMchId"> <if test=" null != payMerchantMchId and '' != payMerchantMchId">
and `pay_merchant_mch_id` = #{payMerchantMchId} and `pay_merchant_mch_id` = #{payMerchantMchId}
</if>
</if>

<if test=" null != sharingMerchantId ">
and `sharing_merchant_id` = #{sharingMerchantId}
</if>

<if test=" null != orderId "> <if test=" null != orderId ">
and `order_id` = #{orderId} and `order_id` = #{orderId}
</if> </if>
@@ -149,9 +154,7 @@
from wx_profit_sharing_order from wx_profit_sharing_order
<include refid="dynamicWhereConditions" /> <include refid="dynamicWhereConditions" />
</select> </select>

<resultMap id="orderMap" type="com.iformall.domain.vo.WxProfitSharingOrderVo"> <resultMap id="orderMap" type="com.iformall.domain.vo.WxProfitSharingOrderVo">
<id column="id" jdbcType="BIGINT" property="id" /> <id column="id" jdbcType="BIGINT" property="id" />
@@ -161,7 +164,9 @@
<result column="b_tenant_id" jdbcType="VARCHAR" property="bTenantId" /> <result column="b_tenant_id" jdbcType="VARCHAR" property="bTenantId" />
<result column="pay_merchant_id" jdbcType="BIGINT" property="payMerchantId" /> <result column="pay_merchant_id" jdbcType="BIGINT" property="payMerchantId" />
<result column="pay_merchant_mch_id" jdbcType="VARCHAR" property="payMerchantMchId" /> <result column="pay_merchant_mch_id" jdbcType="VARCHAR" property="payMerchantMchId" />
<result column="sharing_merchant_id" jdbcType="BIGINT" property="sharingMerchantId" />
<result column="merchant_name" jdbcType="VARCHAR" property="merchantName" /> <result column="merchant_name" jdbcType="VARCHAR" property="merchantName" />
<result column="pay_merchant_name" jdbcType="VARCHAR" property="payMerchantName" />
<result column="order_id" jdbcType="BIGINT" property="orderId" /> <result column="order_id" jdbcType="BIGINT" property="orderId" />
<result column="pay_amount" jdbcType="INTEGER" property="payAmount" /> <result column="pay_amount" jdbcType="INTEGER" property="payAmount" />
<result column="single_order_amount" jdbcType="INTEGER" property="singleOrderAmount" /> <result column="single_order_amount" jdbcType="INTEGER" property="singleOrderAmount" />
@@ -178,10 +183,13 @@
<result column="create_time" jdbcType="TIMESTAMP" property="createTime" /> <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime" /> <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
</resultMap> </resultMap>

<select id="findOrderList" parameterType="com.iformall.domain.vo.WxProfitSharingOrderQueryVo" resultMap="orderMap"> <select id="findOrderList" parameterType="com.iformall.domain.vo.WxProfitSharingOrderQueryVo" resultMap="orderMap">
select pso.*,m.`name` merchant_name from wx_profit_sharing_order pso
select pso.*,m.`name` merchant_name,m1.`name` pay_merchant_name
from wx_profit_sharing_order pso
left join wx_merchant m on pso.merchant_id=m.id left join wx_merchant m on pso.merchant_id=m.id
left join wx_merchant m1 on pso.pay_merchant_id=m1.id
<where> <where>
<if test=" null != tenantId and '' != tenantId"> <if test=" null != tenantId and '' != tenantId">
and pso.`tenant_id` = #{tenantId} and pso.`tenant_id` = #{tenantId}


Загрузка…
Отмена
Сохранить