From f3b1966b36c6667dfe050f81e6c014bd55b2fe6b Mon Sep 17 00:00:00 2001 From: xhxu Date: Tue, 18 Jul 2023 12:18:40 +0800 Subject: [PATCH 1/6] //..settle --- .../domain/vo/WxProfitSharingOrderVo.java | 83 +++++++++++++++++-- .../impl/WxProfitSharingOrderServiceImpl.java | 1 + .../entity/WxComposeChildOrderShare.java | 2 +- .../mapper/WxProfitSharingOrderMapper.xml | 1 + 4 files changed, 79 insertions(+), 8 deletions(-) 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 55bb08557..f95dfd621 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxProfitSharingOrderVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxProfitSharingOrderVo.java @@ -1,11 +1,17 @@ package com.iformall.domain.vo; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.annotation.TableField; import com.iformall.domain.po.base.TenantEntity; import cn.afterturn.easypoi.excel.annotation.Excel; +import com.iformall.service.order.entity.WxComposeChildOrderShare; import lombok.Data; import lombok.EqualsAndHashCode; +import org.apache.commons.lang3.StringUtils; +import java.math.BigDecimal; import java.util.Date; /** @@ -24,15 +30,20 @@ public class WxProfitSharingOrderVo extends TenantEntity { private String mchId; private Long sharingMerchantId; - @Excel(name="商户单号",width = 20,orderNum = "1") + @Excel(name="支付单号",width = 20,orderNum = "1") private Long orderId; - @Excel(name="商户名称",width = 20,orderNum = "2") - private String merchantName; + @Excel(name="分账单号",width = 20,orderNum = "2") + private Long outSettleNo; + @Excel(name="付款商户",width = 20,orderNum = "3") private String payMerchantName; - @Excel(name="到账商户",width = 20,orderNum = "3") + @Excel(name="核销商户",width = 20,orderNum = "5") + private String merchantName; + + + @Excel(name="分账商户",width = 20,orderNum = "14") private String sharingMerchantName; public String getSharingMerchantName(){ @@ -44,9 +55,14 @@ public class WxProfitSharingOrderVo extends TenantEntity { return sharingMerchantName; } - @Excel(name="交易金额(分)",width = 20,orderNum = "4") private Integer payAmount; + @Excel(name = "付款金额(元)", width = 20, orderNum = "4") + private String payAmountStr; + public String getPayAmountStr() { + return payAmount != null ? new BigDecimal(payAmount).divide(new BigDecimal(100)).toPlainString() : payAmountStr; + } + @io.swagger.annotations.ApiModelProperty(value="订单ID",name="singleOrderId") private Long singleOrderId; @io.swagger.annotations.ApiModelProperty(value="单个订单分账总金额(分)",name="singleOrderAmount") @@ -62,14 +78,67 @@ public class WxProfitSharingOrderVo extends TenantEntity { private String transactionId; private String sharingOrderNo; - @Excel(name="分账类型",width = 20,replace = { "单次分账_0", "多次分账_1", "完结分账(多次)_2", "完结分账(单次)_3"},orderNum = "7") +// @Excel(name="分账类型",width = 20,replace = { "单次分账_0", "多次分账_1", "完结分账(多次)_2", "完结分账(单次)_3"},orderNum = "7") private Integer type; private String pointDeduction; private String receivers; private String errorMsg; + + //获取各种扣点费用 + public WxComposeChildOrderShare getComposeChildOrderShare(){ + if(StringUtils.isNotBlank(pointDeduction)){ + try { + WxComposeChildOrderShare wxComposeChildOrderShare = JSON.parseObject(pointDeduction, WxComposeChildOrderShare.class); + return wxComposeChildOrderShare; + }catch(Exception e){} + } + return null; + } + @Excel(name = "支付手续费(元)", width = 20, orderNum = "6") + public String realRateAmountStr; + @Excel(name = "官方抽佣(元)", width = 20, orderNum = "7") + public String commissionAmountStr; + @Excel(name = "达人佣金(元)", width = 20, orderNum = "8") + public String cpsCommissionStr; + @Excel(name = "系统扣点(元)", width = 20, orderNum = "9") + public String systemAmountStr; + @Excel(name = "销售扣点(元)", width = 20, orderNum = "10") + public String sellerAmountStr; + @Excel(name = "运营扣点(元)", width = 20, orderNum = "11") + public String rateAmountStr; + + @Excel(name = "总服务费(元)", width = 20, orderNum = "12") + public String serviceAmountStr; + @Excel(name = "实际分账金额(元)", width = 20, orderNum = "13") + public String shareAmountStr; + + public void getShareAmountStr(){ + WxComposeChildOrderShare composeChildOrderShare = getComposeChildOrderShare(); + if(composeChildOrderShare != null){ + Integer realRateAmount = composeChildOrderShare.getRealRateAmount(); + this.realRateAmountStr = realRateAmount != null ? new BigDecimal(realRateAmount).divide(new BigDecimal(100)).toPlainString() : realRateAmountStr; + Integer commissionAmount = composeChildOrderShare.getCommissionAmount(); + this.commissionAmountStr = commissionAmount != null ? new BigDecimal(commissionAmount).divide(new BigDecimal(100)).toPlainString() : commissionAmountStr; + Integer cpsCommission = composeChildOrderShare.getCpsCommission(); + this.cpsCommissionStr = cpsCommission != null ? new BigDecimal(cpsCommission).divide(new BigDecimal(100)).toPlainString() : cpsCommissionStr; + Integer systemAmount = composeChildOrderShare.getSystemAmount(); + this.systemAmountStr = systemAmount != null ? new BigDecimal(systemAmount).divide(new BigDecimal(100)).toPlainString() : systemAmountStr; + Integer sellerAmount = composeChildOrderShare.getSellerAmount(); + this.sellerAmountStr = sellerAmount != null ? new BigDecimal(sellerAmount).divide(new BigDecimal(100)).toPlainString() : sellerAmountStr; + Integer rateAmount = composeChildOrderShare.getRateAmount(); + this.rateAmountStr = rateAmount != null ? new BigDecimal(rateAmount).divide(new BigDecimal(100)).toPlainString() : rateAmountStr; + Integer serviceAmount = composeChildOrderShare.getServiceAmount(); + this.serviceAmountStr = serviceAmount != null ? new BigDecimal(serviceAmount).divide(new BigDecimal(100)).toPlainString() : serviceAmountStr; + Integer shareAmount = composeChildOrderShare.getShareAmount(); + this.shareAmountStr = shareAmount != null ? new BigDecimal(shareAmount).divide(new BigDecimal(100)).toPlainString() : shareAmountStr; + } + } + - @Excel(name="分账状态",width = 20,replace = { "未知_0", "提交订单失败_1", "提交业务失败_2", "受理成功_3", "处理中_4", "处理完成_5", "处理失败_6"},orderNum = "8") + @Excel(name="分账状态",width = 16,replace = { "未知_0", "提交订单失败_1", "提交业务失败_2", "受理成功_3", "处理中_4", "处理完成_5", "处理失败_6"},orderNum = "8") private Integer sharingStatus; private Date updateTime; + + @Excel(name="分账创建时间",exportFormat = "yyyy-MM-dd HH:mm:ss",width = 15,orderNum = "6") private Date createTime; } 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 73db4ad19..7b5e0c3fc 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingOrderServiceImpl.java @@ -531,6 +531,7 @@ public class WxProfitSharingOrderServiceImpl implements WxProfitSharingOrderServ sharingOrderUpd.setId(sharingOrder.getId()); sharingOrderUpd.updateTenantInfo(sharingOrder); sharingOrderUpd.setSharingStatus(payShareQueryResult.getCode()); + sharingOrderUpd.setErrorMsg("finish!"); sharingOrderUpd.setUpdateTime(new Date()); wxProfitSharingOrderMapper.updateById(sharingOrderUpd); diff --git a/mallinkService/src/main/java/com/iformall/service/order/entity/WxComposeChildOrderShare.java b/mallinkService/src/main/java/com/iformall/service/order/entity/WxComposeChildOrderShare.java index 27eb4b4a4..41842a326 100644 --- a/mallinkService/src/main/java/com/iformall/service/order/entity/WxComposeChildOrderShare.java +++ b/mallinkService/src/main/java/com/iformall/service/order/entity/WxComposeChildOrderShare.java @@ -54,7 +54,7 @@ public class WxComposeChildOrderShare { private Long orderId;//订单编号,v3要用 private Integer realPayMent;//付款金额 - private Integer shareAmount;//商户实际分账的钱 + private Integer shareAmount;//实际分账的钱 private Integer rateAmount;//商场实际通道费(扣除了支付通道费的) diff --git a/mallinkService/src/main/resources/mapper/WxProfitSharingOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxProfitSharingOrderMapper.xml index 3d3dca716..10065b104 100644 --- a/mallinkService/src/main/resources/mapper/WxProfitSharingOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxProfitSharingOrderMapper.xml @@ -158,6 +158,7 @@ + From 5c535c68bac36b4b79a58400c2014bd0ea33067e Mon Sep 17 00:00:00 2001 From: xhxu Date: Tue, 18 Jul 2023 12:22:20 +0800 Subject: [PATCH 2/6] //..settle --- .../iformall/domain/vo/WxProfitSharingOrderVo.java | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) 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 f95dfd621..417494fa6 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxProfitSharingOrderVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxProfitSharingOrderVo.java @@ -84,16 +84,6 @@ public class WxProfitSharingOrderVo extends TenantEntity { private String receivers; private String errorMsg; - //获取各种扣点费用 - public WxComposeChildOrderShare getComposeChildOrderShare(){ - if(StringUtils.isNotBlank(pointDeduction)){ - try { - WxComposeChildOrderShare wxComposeChildOrderShare = JSON.parseObject(pointDeduction, WxComposeChildOrderShare.class); - return wxComposeChildOrderShare; - }catch(Exception e){} - } - return null; - } @Excel(name = "支付手续费(元)", width = 20, orderNum = "6") public String realRateAmountStr; @Excel(name = "官方抽佣(元)", width = 20, orderNum = "7") @@ -112,7 +102,7 @@ public class WxProfitSharingOrderVo extends TenantEntity { @Excel(name = "实际分账金额(元)", width = 20, orderNum = "13") public String shareAmountStr; - public void getShareAmountStr(){ + public WxComposeChildOrderShare getComposeChildOrderShare(){ WxComposeChildOrderShare composeChildOrderShare = getComposeChildOrderShare(); if(composeChildOrderShare != null){ Integer realRateAmount = composeChildOrderShare.getRealRateAmount(); @@ -132,6 +122,7 @@ public class WxProfitSharingOrderVo extends TenantEntity { Integer shareAmount = composeChildOrderShare.getShareAmount(); this.shareAmountStr = shareAmount != null ? new BigDecimal(shareAmount).divide(new BigDecimal(100)).toPlainString() : shareAmountStr; } + return composeChildOrderShare; } From 6c8706849172ca069261586a590aae148adb8b9c Mon Sep 17 00:00:00 2001 From: xhxu Date: Tue, 18 Jul 2023 12:31:03 +0800 Subject: [PATCH 3/6] //..settle --- .../com/iformall/domain/vo/WxProfitSharingOrderVo.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) 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 417494fa6..9777c8dbd 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxProfitSharingOrderVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxProfitSharingOrderVo.java @@ -103,7 +103,12 @@ public class WxProfitSharingOrderVo extends TenantEntity { public String shareAmountStr; public WxComposeChildOrderShare getComposeChildOrderShare(){ - WxComposeChildOrderShare composeChildOrderShare = getComposeChildOrderShare(); + WxComposeChildOrderShare composeChildOrderShare = null; + if(StringUtils.isNotBlank(this.pointDeduction)){ + try{ + composeChildOrderShare = JSON.parseObject(this.pointDeduction, WxComposeChildOrderShare.class); + }catch(Exception e){} + } if(composeChildOrderShare != null){ Integer realRateAmount = composeChildOrderShare.getRealRateAmount(); this.realRateAmountStr = realRateAmount != null ? new BigDecimal(realRateAmount).divide(new BigDecimal(100)).toPlainString() : realRateAmountStr; From 8fe7282ea44922b47f75ea88df36d2afb5ca2a5d Mon Sep 17 00:00:00 2001 From: xhxu Date: Tue, 18 Jul 2023 12:36:27 +0800 Subject: [PATCH 4/6] //..settle --- .../domain/vo/WxProfitSharingOrderVo.java | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) 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 9777c8dbd..b4eeee18b 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxProfitSharingOrderVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxProfitSharingOrderVo.java @@ -102,7 +102,8 @@ public class WxProfitSharingOrderVo extends TenantEntity { @Excel(name = "实际分账金额(元)", width = 20, orderNum = "13") public String shareAmountStr; - public WxComposeChildOrderShare getComposeChildOrderShare(){ + public void setPointDeduction(String pointDeduction){ + this.pointDeduction = pointDeduction; WxComposeChildOrderShare composeChildOrderShare = null; if(StringUtils.isNotBlank(this.pointDeduction)){ try{ @@ -111,23 +112,22 @@ public class WxProfitSharingOrderVo extends TenantEntity { } if(composeChildOrderShare != null){ Integer realRateAmount = composeChildOrderShare.getRealRateAmount(); - this.realRateAmountStr = realRateAmount != null ? new BigDecimal(realRateAmount).divide(new BigDecimal(100)).toPlainString() : realRateAmountStr; + this.realRateAmountStr = realRateAmount != null ? new BigDecimal(realRateAmount).divide(new BigDecimal(100)).toPlainString() : this.realRateAmountStr; Integer commissionAmount = composeChildOrderShare.getCommissionAmount(); - this.commissionAmountStr = commissionAmount != null ? new BigDecimal(commissionAmount).divide(new BigDecimal(100)).toPlainString() : commissionAmountStr; + this.commissionAmountStr = commissionAmount != null ? new BigDecimal(commissionAmount).divide(new BigDecimal(100)).toPlainString() : this.commissionAmountStr; Integer cpsCommission = composeChildOrderShare.getCpsCommission(); - this.cpsCommissionStr = cpsCommission != null ? new BigDecimal(cpsCommission).divide(new BigDecimal(100)).toPlainString() : cpsCommissionStr; + this.cpsCommissionStr = cpsCommission != null ? new BigDecimal(cpsCommission).divide(new BigDecimal(100)).toPlainString() : this.cpsCommissionStr; Integer systemAmount = composeChildOrderShare.getSystemAmount(); - this.systemAmountStr = systemAmount != null ? new BigDecimal(systemAmount).divide(new BigDecimal(100)).toPlainString() : systemAmountStr; + this.systemAmountStr = systemAmount != null ? new BigDecimal(systemAmount).divide(new BigDecimal(100)).toPlainString() : this.systemAmountStr; Integer sellerAmount = composeChildOrderShare.getSellerAmount(); - this.sellerAmountStr = sellerAmount != null ? new BigDecimal(sellerAmount).divide(new BigDecimal(100)).toPlainString() : sellerAmountStr; + this.sellerAmountStr = sellerAmount != null ? new BigDecimal(sellerAmount).divide(new BigDecimal(100)).toPlainString() : this.sellerAmountStr; Integer rateAmount = composeChildOrderShare.getRateAmount(); - this.rateAmountStr = rateAmount != null ? new BigDecimal(rateAmount).divide(new BigDecimal(100)).toPlainString() : rateAmountStr; + this.rateAmountStr = rateAmount != null ? new BigDecimal(rateAmount).divide(new BigDecimal(100)).toPlainString() : this.rateAmountStr; Integer serviceAmount = composeChildOrderShare.getServiceAmount(); - this.serviceAmountStr = serviceAmount != null ? new BigDecimal(serviceAmount).divide(new BigDecimal(100)).toPlainString() : serviceAmountStr; + this.serviceAmountStr = serviceAmount != null ? new BigDecimal(serviceAmount).divide(new BigDecimal(100)).toPlainString() : this.serviceAmountStr; Integer shareAmount = composeChildOrderShare.getShareAmount(); - this.shareAmountStr = shareAmount != null ? new BigDecimal(shareAmount).divide(new BigDecimal(100)).toPlainString() : shareAmountStr; + this.shareAmountStr = shareAmount != null ? new BigDecimal(shareAmount).divide(new BigDecimal(100)).toPlainString() : this.shareAmountStr; } - return composeChildOrderShare; } From 121671ac66901f4989bc2ab6f07be639469748a2 Mon Sep 17 00:00:00 2001 From: xhxu Date: Tue, 18 Jul 2023 12:42:47 +0800 Subject: [PATCH 5/6] //..settle --- .../java/com/iformall/domain/vo/WxProfitSharingOrderVo.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 b4eeee18b..9f6934772 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxProfitSharingOrderVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxProfitSharingOrderVo.java @@ -102,8 +102,7 @@ public class WxProfitSharingOrderVo extends TenantEntity { @Excel(name = "实际分账金额(元)", width = 20, orderNum = "13") public String shareAmountStr; - public void setPointDeduction(String pointDeduction){ - this.pointDeduction = pointDeduction; + public String getPointDeduction(){ WxComposeChildOrderShare composeChildOrderShare = null; if(StringUtils.isNotBlank(this.pointDeduction)){ try{ @@ -128,6 +127,7 @@ public class WxProfitSharingOrderVo extends TenantEntity { Integer shareAmount = composeChildOrderShare.getShareAmount(); this.shareAmountStr = shareAmount != null ? new BigDecimal(shareAmount).divide(new BigDecimal(100)).toPlainString() : this.shareAmountStr; } + return this.pointDeduction; } From ad0c377214b38f5389137739fe7ebe3b4402d633 Mon Sep 17 00:00:00 2001 From: xhxu Date: Tue, 18 Jul 2023 13:07:57 +0800 Subject: [PATCH 6/6] //..settle --- .../java/com/iformall/domain/vo/WxProfitSharingOrderVo.java | 4 ++-- .../service/order/entity/WxComposeChildOrderShare.java | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) 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 9f6934772..b4eeee18b 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxProfitSharingOrderVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxProfitSharingOrderVo.java @@ -102,7 +102,8 @@ public class WxProfitSharingOrderVo extends TenantEntity { @Excel(name = "实际分账金额(元)", width = 20, orderNum = "13") public String shareAmountStr; - public String getPointDeduction(){ + public void setPointDeduction(String pointDeduction){ + this.pointDeduction = pointDeduction; WxComposeChildOrderShare composeChildOrderShare = null; if(StringUtils.isNotBlank(this.pointDeduction)){ try{ @@ -127,7 +128,6 @@ public class WxProfitSharingOrderVo extends TenantEntity { Integer shareAmount = composeChildOrderShare.getShareAmount(); this.shareAmountStr = shareAmount != null ? new BigDecimal(shareAmount).divide(new BigDecimal(100)).toPlainString() : this.shareAmountStr; } - return this.pointDeduction; } diff --git a/mallinkService/src/main/java/com/iformall/service/order/entity/WxComposeChildOrderShare.java b/mallinkService/src/main/java/com/iformall/service/order/entity/WxComposeChildOrderShare.java index 41842a326..41fb447c8 100644 --- a/mallinkService/src/main/java/com/iformall/service/order/entity/WxComposeChildOrderShare.java +++ b/mallinkService/src/main/java/com/iformall/service/order/entity/WxComposeChildOrderShare.java @@ -44,6 +44,10 @@ public class WxComposeChildOrderShare { // this.orderId = orderId; // } + public WxComposeChildOrderShare(){ + + } + public WxComposeChildOrderShare(Long orderId,Integer realPayMent,Long merchantId,String merchantUid) { this.orderId = orderId; this.realPayMent = realPayMent;