Explorar el Código

[分账][修复]:分帐中产生的一些问题

release_toaliyun_real
hupeng hace 7 años
padre
commit
eeff5c6499
Se han modificado 3 ficheros con 10 adiciones y 4 borrados
  1. +1
    -1
      mallinkService/src/main/java/com/iformall/enums/EnumProfitSharingOrderStatus.java
  2. +1
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingOrderServiceImpl.java
  3. +8
    -3
      mallinkService/src/main/resources/mapper/WxProfitSharingOrderMapper.xml

+ 1
- 1
mallinkService/src/main/java/com/iformall/enums/EnumProfitSharingOrderStatus.java Ver fichero

@@ -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, "受理成功"),


+ 1
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingOrderServiceImpl.java Ver fichero

@@ -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);


+ 8
- 3
mallinkService/src/main/resources/mapper/WxProfitSharingOrderMapper.xml Ver fichero

@@ -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 ">


Cargando…
Cancelar
Guardar