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

order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java

@@ -28,8 +28,8 @@ import cn.freemud.entities.dto.shoppingCart.ShoppingCartGoodsDto;
 import cn.freemud.entities.vo.*;
 import cn.freemud.entities.vo.encircle.CreateReserveOrderVo;
 import cn.freemud.entities.vo.encircle.PreviewOrderInfoVo;
-import cn.freemud.enums.ActivityTypeEnum;
 import cn.freemud.enums.*;
+import cn.freemud.enums.ActivityTypeEnum;
 import cn.freemud.enums.OrderChannelType;
 import cn.freemud.enums.OrderSourceType;
 import cn.freemud.enums.OrderType;
@@ -3605,8 +3605,7 @@ public class OrderAdapter {
             , String partnerPayOvertime
             , String orderClient
             , String channel
-            , Integer totalAmount
-            , Integer svcAmount) {
+            , Integer totalAmount) {
         CombPayRequest orderPayDto = new CombPayRequest();
         orderPayDto.setEbCode(paymentRequest.getPayCode());
         orderPayDto.setPartner_id(orderBean.getCompanyId());
@@ -3637,16 +3636,15 @@ public class OrderAdapter {
         }
         orderPayDto.setProducts(productVOS);
         List<PayPlatformVO> platforms = new ArrayList<>();
-        Long svc = svcAmount.longValue();
         PayPlatformVO payPlatformVO = new PayPlatformVO();
         payPlatformVO.setClientCode(PayChannelType.SVC.getEbcode());
         payPlatformVO.setEbcode(PayChannelType.SVC.getEbcode());
-        payPlatformVO.setAmount(svc);
+        payPlatformVO.setAmount(0L);
         platforms.add(payPlatformVO);
 
         String ebcode = PayChannelType.getByIndex(Byte.parseByte(channel)).getEbcode();
         payPlatformVO = new PayPlatformVO();
-        payPlatformVO.setAmount(totalAmount.longValue() - svc);
+        payPlatformVO.setAmount(0L);
         payPlatformVO.setClientCode(orderClient);
         payPlatformVO.setEbcode(ebcode);
         platforms.add(payPlatformVO);
@@ -3664,9 +3662,7 @@ public class OrderAdapter {
      */
     public OrderPayResponse convent2OrderCombPayResponse(List<CombPayResponse.PayPlatform> payPlatforms
             ,String partnerId
-            ,String storeId
-            ,Integer totalAmount
-            ,Integer svcAmount) {
+            ,String storeId) {
         CombPayResponse.PayPlatform payPlatform = payPlatforms
                 .stream()
                 .filter(f -> !PayChannelType.SVC.getEbcode().equals(f.getEbCode())).findFirst()
@@ -3691,7 +3687,6 @@ public class OrderAdapter {
             responseDto.setPayOrder(payBean);
         }
         //供修改订单
-        Integer cashAmount = totalAmount - svcAmount;
         for (CombPayResponse.PayPlatform pt : payPlatforms) {
             PayItem payItem = new PayItem();
             payItem.setFmTradeNo(pt.getFmTradeNo());
@@ -3700,14 +3695,19 @@ public class OrderAdapter {
             payItem.setPayChannelName(PayChannelType.getByEbcode(pt.getEbCode()).getName());
             payItem.setTransId(pt.getTransId());
             payItem.setPartnerId(partnerId);
-            if (pt.getEbCode().equals(PayChannel.SVC.getCode())) {
-                payItem.setPayAmount(new BigDecimal(svcAmount));
+            if (PayChannelType.SVC.getEbcode().equals(pt.getEbCode())) {
+                payItem.setPayAmount(new BigDecimal(pt.getPayAmount()));
+                responseDto.setPayMode(PayChannelType.SVC.getEbcode());
             }
-            else {
-                payItem.setPayAmount(new BigDecimal(cashAmount));
+            else if (PayChannelType.WECHAT.getEbcode().equals(pt.getEbCode()) || PayChannelType.ALIPAY.getEbcode().equals(pt.getEbCode())){
+                payItem.setPayAmount(new BigDecimal(pt.getPayAmount()));
+                responseDto.setPayMode(PayChannelType.getByEbcode(pt.getEbCode()).getEbcode());
             }
             responseDto.getPayItem().add(payItem);
         }
+        if(responseDto.getPayItem().size()==2) {
+            responseDto.setPayMode(PayChannelType.COMB.getEbcode());
+        }
         return responseDto;
     }
 }

order-application-service/src/main/java/cn/freemud/entities/dto/pay/CombPayResponse.java

@@ -51,12 +51,12 @@ public class CombPayResponse {
         @ApiModelProperty(value = "外部交易流水号，由上游系统生成，需保证唯一")
         private String outOrderNo;
 
-        @ApiModelProperty(value = "支付帐号")
-        private String payAccount;
-
         @ApiModelProperty(value = "第三方支付交易序号")
         private String platformTradeNo;
 
+        @ApiModelProperty(value = "支付金额")
+        private Integer payAmount;
+
         @ApiModelProperty(value = "间联单号")
         private String transId;
         @ApiModelProperty(value = "")

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

@@ -4,6 +4,7 @@ import cn.freemud.adapter.LightApplicationConvertToAssortmentSdkAdapter;
 import cn.freemud.adapter.OrderAdapter;
 import cn.freemud.base.entity.BaseResponse;
 import cn.freemud.base.log.LogTreadLocal;
+import cn.freemud.constant.ResponseCodeConstant;
 import cn.freemud.entities.dto.ConfirmOrderDto;
 import cn.freemud.entities.dto.QueryOrdersResponseDto;
 import cn.freemud.entities.vo.AppCreateOrderVo;
@@ -240,6 +241,10 @@ public class OrderAdapterServiceImpl implements OrderAdapterService {
                 return gson.toJson(message);
             }
             QueryOrdersResponseDto.DataBean.OrderBean orderBean = orderBeans.get(OrderBeanType.SAASORDER.getCode());
+            // 混合支付失败，取消订单
+            if (message.getResult_code().equals(ResponseCodeConstant.RESPONSE_SUCCESS)) {
+                return orderService.cannelComPayOrder(confirmOrderDto, orderBean);
+            }
             if (!PayStatus.NOT_PAY.getCode().equals(orderBean.getPayStatus())){
                 return orderAdapter.sendPaySuccessNoticeMessage();
             }

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

@@ -1676,26 +1676,10 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
             svcPayAmount = svcTotalAmount;
             shoppingCartGoodsResponseVo.setTotalAmount((orderAmount.longValue()-svcPayAmount.longValue()));
         }
-        /**
-        BigDecimal svcPayAmount = BigDecimal.ZERO;
-        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());
-        }
-        else {
-            svcPayAmount = new BigDecimal(orderAmount - deliveryAmount).divide(new BigDecimal(100)).setScale(2, BigDecimal.ROUND_HALF_UP);
-            shoppingCartGoodsResponseVo.setTotalAmount(deliveryAmount.longValue());
-        }
-         */
         BigDecimal bigDecimal = new BigDecimal(svcPayAmount);
         String amountStr = bigDecimal.divide(new BigDecimal(100)).setScale(2, BigDecimal.ROUND_HALF_UP).toString();
         shoppingCartGoodsResponseVo.setSvcPayAmount(amountStr);
         shoppingCartGoodsResponseVo.setSvcDiscountDesc("储值卡支付￥" + amountStr);
-        //BigDecimal bigDecimal = new BigDecimal(orderAmount);
-        //String amountStr = bigDecimal.divide(new BigDecimal(100)).setScale(2, BigDecimal.ROUND_HALF_UP).toString();
-        //shoppingCartGoodsResponseVo.setTotalAmount(0L);
-        //shoppingCartGoodsResponseVo.setSvcDiscountDesc("储值卡支付￥" + amountStr);
     }
 
     /**