Merge branch 'feature/2020-1104-混合支付' into develop

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/response/payment/OrderPayResponse.java

@@ -63,6 +63,7 @@ public class OrderPayResponse {
     private String wxAppid;
 
     private String orderId;
+    private String payMode;
     private List<PayItem> payItem = new ArrayList<>();
 
     @NoArgsConstructor

order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java

@@ -2360,7 +2360,10 @@ public class OrderServiceImpl implements Orderservice {
         if (totalAmount > 0 && StringUtils.isBlank(cardCode) && Objects.isNull(createPrepayRequestDto.getUnionPayCard())) {
             createOrderResponse.setPaySuccess(false);
         }
-        else if (totalAmount > 0 && StringUtils.isNotBlank(cardCode)) {
+        else if (StringUtils.isNotBlank(orderPayResponse.getPayMode()) && PayChannelType.COMB.getIndex().equals(orderPayResponse.getPayMode())){
+            createOrderResponse.setPaySuccess(false);
+        }
+        else if (StringUtils.isNotBlank(orderPayResponse.getPayMode()) && PayChannelType.SVC.getIndex().equals(orderPayResponse.getPayMode())){
             createOrderResponse.setPaySuccess(false);
         }
         else {
@@ -2616,6 +2619,7 @@ public class OrderServiceImpl implements Orderservice {
             orderPayResponse.setOpenId(paymentRequest.getOpenId());
             orderPayResponse.setPartnerId(orderBean.getCompanyId());
             orderPayResponse.setOrderId(orderBean.getOid());
+            orderPayResponse.setpayMode(PayChannelType.SVC.getIndex());
         }
         return orderPayResponse;
     }
@@ -3312,7 +3316,7 @@ public class OrderServiceImpl implements Orderservice {
         orderPayResponse.setWxAppid(paymentRequest.getWxAppId());
         orderPayResponse.setPartnerId(orderBean.getCompanyId());
         orderPayResponse.setOrderId(orderBean.getOid());
-
+        orderPayResponse.setpayMode(PayChannelType.COMB.getIndex());
         //隐射关系
         redisCache.save(RedisUtil.getPaymentTransIdOrderKey(payPlatform.getTransId()),orderBean.getOid(),1L,TimeUnit.DAYS);
         //加入轮训队列

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java

@@ -1655,7 +1655,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
         Integer vamount = response.getData().getData().getCardSimpleInfos().get(0).getVamount();
         BigDecimal svcPayAmount = BigDecimal.ZERO;
         //本金+赠送金额
-        if (orderAmount > amount1 + vamount) {
+        if (orderAmount >= amount1 + vamount) {
             //throw new ServiceException(ResponseResult.USER_SVC_CARD_AMOUNT_DEFICIENCY);
             svcPayAmount = new BigDecimal(amount1 + vamount).divide(new BigDecimal(100)).setScale(2, BigDecimal.ROUND_HALF_UP);
             shoppingCartGoodsResponseVo.setTotalAmount(orderAmount - svcPayAmount.multiply(new BigDecimal(100)).longValue());