Skip to content

O
order-group
Commit da6f073d by ping.wu
Options

判断修改

parent 21b26916
Showing with 3 additions and 3 deletions
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartCollageServiceImpl.java
...@@ -1348,7 +1348,7 @@ public class ShoppingCartCollageServiceImpl extends AbstractShoppingCartImpl imp ...@@ -1348,7 +1348,7 @@ public class ShoppingCartCollageServiceImpl extends AbstractShoppingCartImpl imp
Integer amount1 = response.getResult().getCardSimpleInfos().get(0).getAmount(); Integer amount1 = response.getResult().getCardSimpleInfos().get(0).getAmount();
Integer vamount = response.getResult().getCardSimpleInfos().get(0).getVamount(); Integer vamount = response.getResult().getCardSimpleInfos().get(0).getVamount();
Integer applyType = response.getResult().getCardSimpleInfos().get(0).getApplyType(); Integer applyType = response.getResult().getCardSimpleInfos().get(0).getApplyType();
applyType = applyType == null ? 3 : 0; applyType = applyType == null ? 3 : applyType;
String svcDesc = applyType == 3 ? "储值卡支付￥" : "礼品卡支付￥"; String svcDesc = applyType == 3 ? "储值卡支付￥" : "礼品卡支付￥";
if (orderAmount > amount1 + vamount) { if (orderAmount > amount1 + vamount) {
throw new ServiceException(ResponseResult.USER_SVC_CARD_AMOUNT_DEFICIENCY); throw new ServiceException(ResponseResult.USER_SVC_CARD_AMOUNT_DEFICIENCY);
......
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java
...@@ -2302,7 +2302,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService { ...@@ -2302,7 +2302,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
} }
boolean check = this.checkSvcComPay(partnerId, storeId); boolean check = this.checkSvcComPay(partnerId, storeId);
Integer applyType = response.getResult().getCardSimpleInfos().get(0).getApplyType(); Integer applyType = response.getResult().getCardSimpleInfos().get(0).getApplyType();
applyType = applyType == null ? 3 : 0; applyType = applyType == null ? 3 : applyType;
String svcDesc = applyType == 3 ? "储值卡支付￥" : "礼品卡支付￥"; String svcDesc = applyType == 3 ? "储值卡支付￥" : "礼品卡支付￥";
if (check) { if (check) {
//混合支付无需校验svc卡余额,但是配送和包装费不计算在svc卡支付 //混合支付无需校验svc卡余额,但是配送和包装费不计算在svc卡支付
...@@ -2371,7 +2371,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService { ...@@ -2371,7 +2371,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
} }
boolean check = this.checkSvcComPay(partnerId, storeId); boolean check = this.checkSvcComPay(partnerId, storeId);
Integer applyType = response.getResult().getCardSimpleInfos().get(0).getApplyType(); Integer applyType = response.getResult().getCardSimpleInfos().get(0).getApplyType();
applyType = applyType == null ? 3 : 0; applyType = applyType == null ? 3 : applyType;
String svcDesc = applyType == 3 ? "储值卡支付￥" : "礼品卡支付￥"; String svcDesc = applyType == 3 ? "储值卡支付￥" : "礼品卡支付￥";
if (check) { if (check) {
//混合支付无需校验svc卡余额,但是配送和包装费不计算在svc卡支付 //混合支付无需校验svc卡余额,但是配送和包装费不计算在svc卡支付
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment