From 1555b82b59209dfb4daaa828547978e97d8e7911 Mon Sep 17 00:00:00 2001 From: "Stormeye.Wu" Date: Fri, 7 Sep 2018 12:02:46 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=88=86=E8=B4=A6=E6=80=BB=E9=87=91=E9=A2=9D]?= =?UTF-8?q?[=E6=95=B4=E7=90=86]payOrder=E4=B8=AD=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=88=86=E8=B4=A6=E6=80=BB=E9=87=91=E9=A2=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/simple/domain/po/WxPayOrder.java | 46 +++++++++++-------- .../service/impl/WxPayOrderServiceImpl.java | 6 +++ .../resources/mapper/WxPayOrderMapper.xml | 7 ++- 3 files changed, 39 insertions(+), 20 deletions(-) diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxPayOrder.java b/mallinkService/src/main/java/com/simple/domain/po/WxPayOrder.java index 620d63743..d57e2941a 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxPayOrder.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxPayOrder.java @@ -42,52 +42,55 @@ public class WxPayOrder implements Serializable { - /*租户ID**/ + /**租户ID**/ @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; - /*创建时间**/ + /**创建时间**/ @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createTime") private Date createTime; - /*更新时间**/ + /**更新时间**/ @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateTime") private Date updateTime; - /*订单ID**/ + /**订单ID**/ @io.swagger.annotations.ApiModelProperty(value="订单ID",name="orderId") private Long orderId; - /*用户ID**/ + /**用户ID**/ @io.swagger.annotations.ApiModelProperty(value="用户ID",name="cUserId") private Long cUserId; - /*ip地址**/ + /**ip地址**/ @io.swagger.annotations.ApiModelProperty(value="ip地址",name="ip") private String ip; - /*支付金额(分)**/ + /**支付金额(分)**/ @io.swagger.annotations.ApiModelProperty(value="支付金额(分)",name="payAmount") private Integer payAmount; - /*支付发起时间**/ + /**支付发起时间**/ @io.swagger.annotations.ApiModelProperty(value="支付发起时间",name="payTimeStart") private Date payTimeStart; - /*支付结束时间**/ + /**支付结束时间**/ @io.swagger.annotations.ApiModelProperty(value="支付结束时间",name="payTimeEnd") private Date payTimeEnd; - /*微信预支付交易会话标识**/ + /**微信预支付交易会话标识**/ @io.swagger.annotations.ApiModelProperty(value="微信预支付交易会话标识",name="prepayId") private String prepayId; - /*微信生成的订单号**/ + /**微信生成的订单号**/ @io.swagger.annotations.ApiModelProperty(value="微信生成的订单号",name="transactionId") private String transactionId; - /*支付渠道: 0-微信 1-支付宝 2-银联 **/ + /**支付渠道: 0-微信 1-支付宝 2-银联 **/ @io.swagger.annotations.ApiModelProperty(value="支付渠道: 0-微信 1-支付宝 2-银联 ",name="payVendor") private Integer payVendor; - /*支付订单号**/ + /**支付订单号**/ @io.swagger.annotations.ApiModelProperty(value="支付订单号",name="payOrderNo") private String payOrderNo; - /*支付状态: 0-支付中;1-支付成功;2-支付失败**/ + /**支付状态: 0-支付中;1-支付成功;2-支付失败**/ @io.swagger.annotations.ApiModelProperty(value="支付状态: 0-支付中;1-支付成功;2-支付失败",name="payOrderStatus") private Integer payOrderStatus; - /*分账状态: 0-未分账;1-分账**/ + /**分账状态: 0-未分账;1-分账**/ @io.swagger.annotations.ApiModelProperty(value="分账状态: 0-未分账;1-分账",name="payOrderStatus") private Integer share; - /*支付失败原因**/ + /**分账金额(总金额扣除手续费后的金额)**/ + @io.swagger.annotations.ApiModelProperty(value="分账金额",name="shareAmount") + private Integer shareAmount; + /**支付失败原因**/ @io.swagger.annotations.ApiModelProperty(value="支付失败原因",name="failReason") private String failReason; public String getTenantId() { @@ -184,11 +187,18 @@ public class WxPayOrder implements Serializable { public Integer getShare() { return share; } - public void setShare(Integer share) { this.share = share; } + public Integer getShareAmount() { + return shareAmount; + } + + public void setShareAmount(Integer shareAmount) { + this.shareAmount = shareAmount; + } + public String getFailReason() { return failReason; } @@ -216,6 +226,7 @@ public class WxPayOrder implements Serializable { ,PayOrderNo_ASC("`pay_order_no` ASC"),PayOrderNo_DESC("`pay_order_no` DESC") ,PayOrderStatus_ASC("`pay_order_status` ASC"),PayOrderStatus_DESC("`pay_order_status` DESC") ,Share_ASC("`share` ASC"),Share_DESC("`share` DESC") + ,ShareAmount_ASC("`share_amount` ASC"),ShareAmount_DESC("`share_amount` DESC") ,FailReason_ASC("`fail_reason` ASC"),FailReason_DESC("`fail_reason` DESC") ; private String value; @@ -251,7 +262,6 @@ public class WxPayOrder implements Serializable { } this.sortColumns = sb.toString(); - } public void setSortColumns(String sortColumns) diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxPayOrderServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxPayOrderServiceImpl.java index 98d1156a5..32d5cf9e2 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxPayOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxPayOrderServiceImpl.java @@ -152,6 +152,12 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { record.setPayVendor(EnumPayWay.PAY_WAY_WEAPP.getCode()); record.setPayOrderStatus(EnumPayStatus.PAY_WAY_WAIT.getCode()); record.setShare(isShare.getCode()); + if (isShare == EnumPayShare.YES) { + // 分账金额 + Float dChargeFee = record.getPayAmount()*1.0f*payAccount.getRate()/1000; + Integer share_amount = record.getPayAmount() - Math.round(dChargeFee.floatValue()); + record.setShareAmount(share_amount); + } int sqlRow = wxPayOrderMapper.insertSelective(record); if (sqlRow != 1) { diff --git a/mallinkService/src/main/resources/mapper/WxPayOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxPayOrderMapper.xml index ba43d7505..60643f0c7 100644 --- a/mallinkService/src/main/resources/mapper/WxPayOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxPayOrderMapper.xml @@ -18,11 +18,12 @@ + - `id`,`tenant_id`,`create_time`,`update_time`,`order_id`,`c_user_id`,`ip`,`pay_amount`,`pay_time_start`,`pay_time_end`,`prepay_id`,`transaction_id`,`pay_vendor`,`pay_order_no`,`pay_order_status`,`share`,`fail_reason` + `id`,`tenant_id`,`create_time`,`update_time`,`order_id`,`c_user_id`,`ip`,`pay_amount`,`pay_time_start`,`pay_time_end`,`prepay_id`,`transaction_id`,`pay_vendor`,`pay_order_no`,`pay_order_status`,`share`,`share_amount`,`fail_reason` @@ -90,7 +91,9 @@ and `share` = #{share} - + + and `share_amount` = #{shareAmount} + and `fail_reason` like concat('%', #{failReason},'%')