| @@ -4,7 +4,7 @@ package com.iformall.enums; | |||||
| * Created by Stormeye on 2018/08/09. | * Created by Stormeye on 2018/08/09. | ||||
| */ | */ | ||||
| public enum EnumProfitSharingOrderStatus { | public enum EnumProfitSharingOrderStatus { | ||||
| PROFIT_SHARING_UNKNOWN(-1, "未知"), | |||||
| PROFIT_SHARING_UNKNOWN(0, "未知"), | |||||
| PROFIT_SHARING_REQ_FAILED(1, "提交订单失败"), | PROFIT_SHARING_REQ_FAILED(1, "提交订单失败"), | ||||
| PROFIT_SHARING_APPLY_FAILED(2, "提交业务失败"), | PROFIT_SHARING_APPLY_FAILED(2, "提交业务失败"), | ||||
| PROFIT_SHARING_ACCEPTED(3, "受理成功"), | PROFIT_SHARING_ACCEPTED(3, "受理成功"), | ||||
| @@ -570,6 +570,7 @@ public class WxProfitSharingOrderServiceImpl implements WxProfitSharingOrderServ | |||||
| record.setTransactionId(sharingOrderDto.getTransactionId()); | record.setTransactionId(sharingOrderDto.getTransactionId()); | ||||
| record.setPayAmount(sharingOrderDto.getPayAmount()); | record.setPayAmount(sharingOrderDto.getPayAmount()); | ||||
| record.setMerchantId(sharingOrderDto.getMerchantId()); | record.setMerchantId(sharingOrderDto.getMerchantId()); | ||||
| record.setOrderId(sharingOrderDto.getOrderId()); | |||||
| record.setSharingStatus(EnumProfitSharingOrderStatus.PROFIT_SHARING_UNKNOWN.getCode()); | record.setSharingStatus(EnumProfitSharingOrderStatus.PROFIT_SHARING_UNKNOWN.getCode()); | ||||
| record.setCreateTime(currentDate); | record.setCreateTime(currentDate); | ||||
| record.setUpdateTime(currentDate); | record.setUpdateTime(currentDate); | ||||
| @@ -44,11 +44,16 @@ | |||||
| <if test=" null != orderId "> | <if test=" null != orderId "> | ||||
| and `order_id` = #{orderId} | and `order_id` = #{orderId} | ||||
| </if> | |||||
| </if> | |||||
| <if test=" null != type "> | |||||
| and `type` = #{type} | |||||
| </if> | |||||
| <if test=" null != payAmount "> | <if test=" null != payAmount "> | ||||
| and `pay_amount` = #{payAmount} | and `pay_amount` = #{payAmount} | ||||
| </if> | </if> | ||||
| <if test=" null != payTimeEnd "> | <if test=" null != payTimeEnd "> | ||||