From 074e4411d38fd5a4fd65ce45ff658e0e21b5626a Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Fri, 28 Dec 2018 14:46:28 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=8D=A1=E6=B6=88=E8=B4=B9][=E4=BF=AE?= =?UTF-8?q?=E6=94=B9]:=E6=BB=A120=E6=AC=A1=E5=90=8E,=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E8=B0=83=E7=94=A8=E5=88=86=E8=B4=A6=E5=AE=8C=E7=BB=93=EF=BC=8C?= =?UTF-8?q?=E5=8D=A1=E6=B6=88=E8=B4=B9=E7=8A=B6=E6=80=81=E6=A0=87=E4=B8=BA?= =?UTF-8?q?=E6=9C=AA=E5=88=86=E8=B4=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/WxCardSpendServiceImpl.java | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) 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 f50a97d85..64517e850 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java @@ -141,6 +141,7 @@ public class WxCardSpendServiceImpl implements WxCardSpendService { record.setCardRemainAmount(remaingAmount); record.setCardBeforeRealAmount(cardInfo.getRemainingShareFeeAmount()); record.setCardRemainRealAmount(remain_real_pament); + record.setPayStatus(EnumCardSpendStatus.NOT_PAY.getCode()); record.setCreateDate(curDate); record.setUpdateDate(curDate); try { @@ -316,6 +317,7 @@ public class WxCardSpendServiceImpl implements WxCardSpendService { WxMerchant merchant = wxMerchantMapper.selectByPrimaryKey(cardSpend.getMerchantId()); if (cardSpend != null && cardInfo != null && merchant != null) { + // 分账 WxSharingOrderDto shareOrder = new WxSharingOrderDto(); shareOrder.setcUserId(cardSpend.getOwnerId()); shareOrder.setMerchantId(cardSpend.getMerchantId()); @@ -332,7 +334,20 @@ public class WxCardSpendServiceImpl implements WxCardSpendService { // 分账异常 throw new MallinkException(resultData.code, resultData.message); } - if(cardSpend.getCardRemainAmount().equals(0)) { + + // 卡消费记录状态更新 + { + WxCardSpend updateRecord = new WxCardSpend(); + updateRecord.setId(cardSpend.getId()); + updateRecord.setPayStatus(EnumCardSpendStatus.PS_SHARED.getCode()); + updateRecord.setUpdateDate(new Date()); + wxCardSpendMapper.updateByPrimaryKeySelective(updateRecord); + } + + + if(cardSpend.getCardRemainAmount().equals(0) + || psNum == 19) { + // 卡余额为0,或者卡已分账20次,发起分账完结 if (cardSpend.getCardRemainRealAmount() > 0) { // 卡已被抵扣,但是分账还有余额 cardShareFinished(cardInfo, shareOrder);