diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumProfitSharingOrderStatus.java b/mallinkService/src/main/java/com/iformall/enums/EnumProfitSharingOrderStatus.java index f78e5129a..be59246a2 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumProfitSharingOrderStatus.java +++ b/mallinkService/src/main/java/com/iformall/enums/EnumProfitSharingOrderStatus.java @@ -4,7 +4,7 @@ package com.iformall.enums; * Created by Stormeye on 2018/08/09. */ public enum EnumProfitSharingOrderStatus { - PROFIT_SHARING_UNKNOWN(-1, "未知"), + PROFIT_SHARING_UNKNOWN(0, "未知"), PROFIT_SHARING_REQ_FAILED(1, "提交订单失败"), PROFIT_SHARING_APPLY_FAILED(2, "提交业务失败"), PROFIT_SHARING_ACCEPTED(3, "受理成功"), 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 6ccb88227..0d394cc78 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingOrderServiceImpl.java @@ -570,6 +570,7 @@ public class WxProfitSharingOrderServiceImpl implements WxProfitSharingOrderServ record.setTransactionId(sharingOrderDto.getTransactionId()); record.setPayAmount(sharingOrderDto.getPayAmount()); record.setMerchantId(sharingOrderDto.getMerchantId()); + record.setOrderId(sharingOrderDto.getOrderId()); record.setSharingStatus(EnumProfitSharingOrderStatus.PROFIT_SHARING_UNKNOWN.getCode()); record.setCreateTime(currentDate); record.setUpdateTime(currentDate); diff --git a/mallinkService/src/main/resources/mapper/WxProfitSharingOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxProfitSharingOrderMapper.xml index 3b77a249d..5f03e8259 100644 --- a/mallinkService/src/main/resources/mapper/WxProfitSharingOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxProfitSharingOrderMapper.xml @@ -44,11 +44,16 @@ and `order_id` = #{orderId} - - + + + + and `type` = #{type} + + + and `pay_amount` = #{payAmount} - +