Просмотр исходного кода

[消费卡][修改]:有价卡支持无分账

release_toaliyun_real
Stormeye Wu 6 лет назад
Родитель
Сommit
f1502c812b
4 измененных файлов: 5 добавлений и 5 удалений
  1. +1
    -1
      mallinkService/src/main/java/com/iformall/domain/po/WxPayAccount.java
  2. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java
  3. +2
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java
  4. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxSubsidyServiceImpl.java

+ 1
- 1
mallinkService/src/main/java/com/iformall/domain/po/WxPayAccount.java Просмотреть файл

@@ -44,6 +44,6 @@ public class WxPayAccount extends BaseEntity {
return notifyUrl + "/subsidyPay"; return notifyUrl + "/subsidyPay";
} }


public boolean isShare() { return share > 0; }
public boolean checkShare() { return share > 0; }


} }

+ 1
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java Просмотреть файл

@@ -241,7 +241,7 @@ public class WxCardSpendServiceImpl implements WxCardSpendService {
} }
} }


if (payAccount.isShare()) {
if (payAccount.checkShare()) {
// 9. 分账 // 9. 分账
try { try {
shareForCardPay(record.getTenantId(), record.getCardId(), record.getOrderId(), record.getId()); shareForCardPay(record.getTenantId(), record.getCardId(), record.getOrderId(), record.getId());


+ 2
- 2
mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java Просмотреть файл

@@ -169,7 +169,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService {
return new ResultData(ErrorCode.PAY_ORDER_IS_NOT_PAYMENT); return new ResultData(ErrorCode.PAY_ORDER_IS_NOT_PAYMENT);
} }
WxPayAccount payAccount = wxPayAccountMapper.selectById(appInfo.getPayId()); WxPayAccount payAccount = wxPayAccountMapper.selectById(appInfo.getPayId());
if (payAccount.getShare().intValue() > 0) {
if (payAccount.checkShare()) {
isShare = EnumPayShare.YES; isShare = EnumPayShare.YES;
} }


@@ -433,7 +433,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService {
return new ResultData(ErrorCode.PAY_ORDER_IS_NOT_PAYMENT); return new ResultData(ErrorCode.PAY_ORDER_IS_NOT_PAYMENT);
} }
WxPayAccount payAccount = wxPayAccountMapper.selectById(appInfo.getPayId()); WxPayAccount payAccount = wxPayAccountMapper.selectById(appInfo.getPayId());
if (payAccount.getShare().intValue() > 0) {
if (payAccount.checkShare()) {
isShare = EnumPayShare.YES; isShare = EnumPayShare.YES;
} }




+ 1
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxSubsidyServiceImpl.java Просмотреть файл

@@ -91,7 +91,7 @@ public class WxSubsidyServiceImpl implements WxSubsidyService {
WxAppinfo appInfo = wxAppinfoService.getCAppInfo(user.getTenantId()); WxAppinfo appInfo = wxAppinfoService.getCAppInfo(user.getTenantId());
// 2. 获取payAccount // 2. 获取payAccount
WxPayAccount payAccount = wxPayAccountMapper.selectById(appInfo.getPayId()); WxPayAccount payAccount = wxPayAccountMapper.selectById(appInfo.getPayId());
if (payAccount.getShare().intValue() > 0) {
if (payAccount.checkShare()) {
isShare = EnumPayShare.YES; isShare = EnumPayShare.YES;
} }
// 3. 补贴订单 // 3. 补贴订单


Загрузка…
Отмена
Сохранить