Browse Source

[卡完结][修改]:卡完结,merchant填0

release_toaliyun_real
Stormeye Wu 7 years ago
parent
commit
e5a481a30c
2 changed files with 3 additions and 1 deletions
  1. +1
    -1
      mallinkBApi/src/main/java/com/iformall/controller/WxInfoController.java
  2. +2
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java

+ 1
- 1
mallinkBApi/src/main/java/com/iformall/controller/WxInfoController.java View File

@@ -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);



+ 2
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java View File

@@ -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);
}
}


Loading…
Cancel
Save