From e5a481a30cdbd5515fda27db252a878f93da4bdb Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Wed, 27 Mar 2019 14:17:49 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=8D=A1=E5=AE=8C=E7=BB=93][=E4=BF=AE?= =?UTF-8?q?=E6=94=B9]:=E5=8D=A1=E5=AE=8C=E7=BB=93=EF=BC=8Cmerchant?= =?UTF-8?q?=E5=A1=AB0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/iformall/controller/WxInfoController.java | 2 +- .../java/com/iformall/service/impl/WxCardSpendServiceImpl.java | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxInfoController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxInfoController.java index 2d5129139..967a11f78 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxInfoController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxInfoController.java @@ -205,7 +205,7 @@ public class WxInfoController extends BaseController { // 解密 WxMaPhoneNumberInfo phoneNoInfo = wxMaService.getUserService().getPhoneNoInfo(session_key, encryptedData, iv); if (null != phoneNoInfo) { - logger.debug(phoneNoInfo.toString()); + logger.info(phoneNoInfo.toString()); String phone = phoneNoInfo.getPhoneNumber(); resultMap.put("phone", phone); 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 5de4e3513..b67420091 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java @@ -342,6 +342,7 @@ public class WxCardSpendServiceImpl implements WxCardSpendService { WxSharingOrderDto shareOrder = new WxSharingOrderDto(); shareOrder.setcUserId(couponOrder.getOwnerId()); shareOrder.setTenantId(tenantId); + shareOrder.setMerchantId(0L); // 卡完结,默认给0 shareOrder.setTransactionId(cardInfo.getTransactionId()); cardShareFinished(cardInfo, shareOrder); } catch (MallinkException e) { @@ -432,6 +433,7 @@ public class WxCardSpendServiceImpl implements WxCardSpendService { // 卡余额为0,或者卡已分账20次,发起分账完结 if (cardSpend.getCardRemainRealAmount() > 0) { // 卡已被抵扣,但是分账还有余额 + shareOrder.setMerchantId(0L); // 卡完结,填0 cardShareFinished(cardInfo, shareOrder); } }