Преглед изворни кода

[分账总金额][整理]payOrder中添加分账总金额

release_toaliyun_real
Stormeye.Wu пре 7 година
родитељ
комит
1555b82b59
3 измењених фајлова са 39 додато и 20 уклоњено
  1. +28
    -18
      mallinkService/src/main/java/com/simple/domain/po/WxPayOrder.java
  2. +6
    -0
      mallinkService/src/main/java/com/simple/service/impl/WxPayOrderServiceImpl.java
  3. +5
    -2
      mallinkService/src/main/resources/mapper/WxPayOrderMapper.xml

+ 28
- 18
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") @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId")
private String tenantId; private String tenantId;
/*创建时间**/
/**创建时间**/
@io.swagger.annotations.ApiModelProperty(value="创建时间",name="createTime") @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createTime")
private Date createTime; private Date createTime;
/*更新时间**/
/**更新时间**/
@io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateTime") @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateTime")
private Date updateTime; private Date updateTime;
/*订单ID**/
/**订单ID**/
@io.swagger.annotations.ApiModelProperty(value="订单ID",name="orderId") @io.swagger.annotations.ApiModelProperty(value="订单ID",name="orderId")
private Long orderId; private Long orderId;
/*用户ID**/
/**用户ID**/
@io.swagger.annotations.ApiModelProperty(value="用户ID",name="cUserId") @io.swagger.annotations.ApiModelProperty(value="用户ID",name="cUserId")
private Long cUserId; private Long cUserId;
/*ip地址**/
/**ip地址**/
@io.swagger.annotations.ApiModelProperty(value="ip地址",name="ip") @io.swagger.annotations.ApiModelProperty(value="ip地址",name="ip")
private String ip; private String ip;
/*支付金额(分)**/
/**支付金额(分)**/
@io.swagger.annotations.ApiModelProperty(value="支付金额(分)",name="payAmount") @io.swagger.annotations.ApiModelProperty(value="支付金额(分)",name="payAmount")
private Integer payAmount; private Integer payAmount;
/*支付发起时间**/
/**支付发起时间**/
@io.swagger.annotations.ApiModelProperty(value="支付发起时间",name="payTimeStart") @io.swagger.annotations.ApiModelProperty(value="支付发起时间",name="payTimeStart")
private Date payTimeStart; private Date payTimeStart;
/*支付结束时间**/
/**支付结束时间**/
@io.swagger.annotations.ApiModelProperty(value="支付结束时间",name="payTimeEnd") @io.swagger.annotations.ApiModelProperty(value="支付结束时间",name="payTimeEnd")
private Date payTimeEnd; private Date payTimeEnd;
/*微信预支付交易会话标识**/
/**微信预支付交易会话标识**/
@io.swagger.annotations.ApiModelProperty(value="微信预支付交易会话标识",name="prepayId") @io.swagger.annotations.ApiModelProperty(value="微信预支付交易会话标识",name="prepayId")
private String prepayId; private String prepayId;
/*微信生成的订单号**/
/**微信生成的订单号**/
@io.swagger.annotations.ApiModelProperty(value="微信生成的订单号",name="transactionId") @io.swagger.annotations.ApiModelProperty(value="微信生成的订单号",name="transactionId")
private String transactionId; private String transactionId;
/*支付渠道: 0-微信 1-支付宝 2-银联 **/
/**支付渠道: 0-微信 1-支付宝 2-银联 **/
@io.swagger.annotations.ApiModelProperty(value="支付渠道: 0-微信 1-支付宝 2-银联 ",name="payVendor") @io.swagger.annotations.ApiModelProperty(value="支付渠道: 0-微信 1-支付宝 2-银联 ",name="payVendor")
private Integer payVendor; private Integer payVendor;
/*支付订单号**/
/**支付订单号**/
@io.swagger.annotations.ApiModelProperty(value="支付订单号",name="payOrderNo") @io.swagger.annotations.ApiModelProperty(value="支付订单号",name="payOrderNo")
private String payOrderNo; private String payOrderNo;
/*支付状态: 0-支付中;1-支付成功;2-支付失败**/
/**支付状态: 0-支付中;1-支付成功;2-支付失败**/
@io.swagger.annotations.ApiModelProperty(value="支付状态: 0-支付中;1-支付成功;2-支付失败",name="payOrderStatus") @io.swagger.annotations.ApiModelProperty(value="支付状态: 0-支付中;1-支付成功;2-支付失败",name="payOrderStatus")
private Integer payOrderStatus; private Integer payOrderStatus;
/*分账状态: 0-未分账;1-分账**/
/**分账状态: 0-未分账;1-分账**/
@io.swagger.annotations.ApiModelProperty(value="分账状态: 0-未分账;1-分账",name="payOrderStatus") @io.swagger.annotations.ApiModelProperty(value="分账状态: 0-未分账;1-分账",name="payOrderStatus")
private Integer share; private Integer share;
/*支付失败原因**/
/**分账金额(总金额扣除手续费后的金额)**/
@io.swagger.annotations.ApiModelProperty(value="分账金额",name="shareAmount")
private Integer shareAmount;
/**支付失败原因**/
@io.swagger.annotations.ApiModelProperty(value="支付失败原因",name="failReason") @io.swagger.annotations.ApiModelProperty(value="支付失败原因",name="failReason")
private String failReason; private String failReason;
public String getTenantId() { public String getTenantId() {
@@ -184,11 +187,18 @@ public class WxPayOrder implements Serializable {
public Integer getShare() { public Integer getShare() {
return share; return share;
} }

public void setShare(Integer share) { public void setShare(Integer share) {
this.share = share; this.share = share;
} }


public Integer getShareAmount() {
return shareAmount;
}

public void setShareAmount(Integer shareAmount) {
this.shareAmount = shareAmount;
}

public String getFailReason() { public String getFailReason() {
return failReason; return failReason;
} }
@@ -216,6 +226,7 @@ public class WxPayOrder implements Serializable {
,PayOrderNo_ASC("`pay_order_no` ASC"),PayOrderNo_DESC("`pay_order_no` DESC") ,PayOrderNo_ASC("`pay_order_no` ASC"),PayOrderNo_DESC("`pay_order_no` DESC")
,PayOrderStatus_ASC("`pay_order_status` ASC"),PayOrderStatus_DESC("`pay_order_status` DESC") ,PayOrderStatus_ASC("`pay_order_status` ASC"),PayOrderStatus_DESC("`pay_order_status` DESC")
,Share_ASC("`share` ASC"),Share_DESC("`share` 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") ,FailReason_ASC("`fail_reason` ASC"),FailReason_DESC("`fail_reason` DESC")
; ;
private String value; private String value;
@@ -251,7 +262,6 @@ public class WxPayOrder implements Serializable {
} }


this.sortColumns = sb.toString(); this.sortColumns = sb.toString();
} }
public void setSortColumns(String sortColumns) public void setSortColumns(String sortColumns)


+ 6
- 0
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.setPayVendor(EnumPayWay.PAY_WAY_WEAPP.getCode());
record.setPayOrderStatus(EnumPayStatus.PAY_WAY_WAIT.getCode()); record.setPayOrderStatus(EnumPayStatus.PAY_WAY_WAIT.getCode());
record.setShare(isShare.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); int sqlRow = wxPayOrderMapper.insertSelective(record);
if (sqlRow != 1) { if (sqlRow != 1) {


+ 5
- 2
mallinkService/src/main/resources/mapper/WxPayOrderMapper.xml Прегледај датотеку

@@ -18,11 +18,12 @@
<result column="pay_order_no" jdbcType="VARCHAR" property="payOrderNo"/> <result column="pay_order_no" jdbcType="VARCHAR" property="payOrderNo"/>
<result column="pay_order_status" jdbcType="INTEGER" property="payOrderStatus"/> <result column="pay_order_status" jdbcType="INTEGER" property="payOrderStatus"/>
<result column="share" jdbcType="INTEGER" property="share"/> <result column="share" jdbcType="INTEGER" property="share"/>
<result column="share_amount" jdbcType="INTEGER" property="shareAmount"/>
<result column="fail_reason" jdbcType="VARCHAR" property="failReason"/> <result column="fail_reason" jdbcType="VARCHAR" property="failReason"/>
</resultMap> </resultMap>


<sql id="allColumns"> <sql id="allColumns">
`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`
</sql> </sql>


<sql id="dynamicWhereConditions"> <sql id="dynamicWhereConditions">
@@ -90,7 +91,9 @@
<if test=" null != share "> <if test=" null != share ">
and `share` = #{share} and `share` = #{share}
</if> </if>

<if test=" null != shareAmount ">
and `share_amount` = #{shareAmount}
</if>
<if test=" null != failReason "> <if test=" null != failReason ">
and `fail_reason` like concat('%', #{failReason},'%') and `fail_reason` like concat('%', #{failReason},'%')
</if> </if>


Loading…
Откажи
Сачувај