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;