From c5fdb0191bec31366acfbea8c7cea6c6c451699d Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Tue, 18 Dec 2018 14:24:46 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=82=A8=E5=80=BC=E5=8D=A1][=E4=BF=AE?= =?UTF-8?q?=E6=94=B9]:=E5=88=86=E8=B4=A6=E5=AE=8C=E7=BB=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/service/impl/WxCardSpendServiceImpl.java | 4 ++-- .../service/impl/WxProfitSharingOrderServiceImpl.java | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java index 84da4ffbf..48a700930 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java @@ -248,8 +248,8 @@ public class WxCardSpendServiceImpl implements WxCardSpendService { shareOrder.setTransactionId(cardInfo.getTransactionId()); shareOrder.setShareAmount(cardSpend.getRealPayment()); profitSharingOrderService.createSharingOrder(shareOrder); - if(cardSpend.getCardRemainRealAmount() == 0) { - shareOrder.setPayAmount(cardInfo.getSaleAmount()); + if(cardSpend.getCardRemainAmount() <= 0) { + shareOrder.setPayAmount(cardInfo.getRemainingShareFeeAmount()); shareOrder.setType(EnumProfitSharingOrderType.PROFIT_SHARING_FINISH.getCode()); profitSharingOrderService.finishSharingOrder(shareOrder); } 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 adc5679f6..cd74fe340 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingOrderServiceImpl.java @@ -449,6 +449,8 @@ public class WxProfitSharingOrderServiceImpl implements WxProfitSharingOrderServ psFCmd.setNonce_str(Utility.generate32UUID()); psFCmd.setTransaction_id(sharingOrderDto.getTransactionId()); psFCmd.setOut_order_no(record.getId().toString()); + psFCmd.setAmount(sharingOrderDto.getPayAmount()); + psFCmd.setDescription("分账已完结"); psFCmd.setSign_type("HMAC-SHA256"); String response;