From 40bcdc74faec3a8646722f6c058b85035a2e3775 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Tue, 18 Dec 2018 20:58:53 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=BE=AE=E4=BF=A1=E5=88=86=E8=B4=A6][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9]:=E5=88=86=E8=B4=A6=E5=AE=8C=E7=BB=93?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/WxCardSpendServiceImpl.java | 1 + .../impl/WxProfitSharingOrderServiceImpl.java | 35 ++++++++----------- 2 files changed, 16 insertions(+), 20 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 ffe295e8a..646e10d3c 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java @@ -275,6 +275,7 @@ public class WxCardSpendServiceImpl implements WxCardSpendService { if(cardSpend.getCardRemainAmount().equals(0)) { // 卡已被抵扣,但是分账还有余额 if (cardSpend.getCardRemainRealAmount() > 0) { + shareOrder.setOrderId(null); shareOrder.setPayAmount(0); shareOrder.setShareAmount(cardInfo.getRemainingShareFeeAmount()); shareOrder.setType(EnumProfitSharingOrderType.PROFIT_SHARING_FINISH.getCode()); 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 5f34dd8b0..8b5108d53 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingOrderServiceImpl.java @@ -432,27 +432,22 @@ public class WxProfitSharingOrderServiceImpl implements WxProfitSharingOrderServ //分账检查是否已创建分账订单 WxProfitSharingOrder record = new WxProfitSharingOrder(); - + //创建分账订单 + Date currentDate = new Date(); + record = new WxProfitSharingOrder(); + record.setId(idworker.nextId()); + record.setTenantId(sharingOrderDto.getTenantId()); + record.setTransactionId(sharingOrderDto.getTransactionId()); record.setOrderId(sharingOrderDto.getOrderId()); - record = wxProfitSharingOrderMapper.selectOne(record); - if (record == null) { - //创建分账订单 - Date currentDate = new Date(); - record = new WxProfitSharingOrder(); - record.setId(idworker.nextId()); - record.setTenantId(sharingOrderDto.getTenantId()); - record.setTransactionId(sharingOrderDto.getTransactionId()); - record.setOrderId(sharingOrderDto.getOrderId()); - record.setPayAmount(sharingOrderDto.getPayAmount()); - record.setMerchantId(sharingOrderDto.getMerchantId()); - record.setSharingStatus(EnumProfitSharingOrderStatus.PROFIT_SHARING_UNKNOWN.getCode()); - record.setCreateTime(currentDate); - record.setUpdateTime(currentDate); - record.setPayTimeStart(sharingOrderDto.getPayTimeStart()); - record.setPayTimeEnd(sharingOrderDto.getPayTimeEnd()); - record.setType(sharingOrderDto.getType()); - wxProfitSharingOrderMapper.insertSelective(record); - } + record.setPayAmount(sharingOrderDto.getPayAmount()); + record.setMerchantId(sharingOrderDto.getMerchantId()); + record.setSharingStatus(EnumProfitSharingOrderStatus.PROFIT_SHARING_UNKNOWN.getCode()); + record.setCreateTime(currentDate); + record.setUpdateTime(currentDate); + record.setPayTimeStart(sharingOrderDto.getPayTimeStart()); + record.setPayTimeEnd(sharingOrderDto.getPayTimeEnd()); + record.setType(sharingOrderDto.getType()); + wxProfitSharingOrderMapper.insertSelective(record); //分账提交 WxProfitSharingFinishP psFCmd = new WxProfitSharingFinishP();