Merge remote-tracking branch 'origin/qa' into qa

order-application-service/pom.xml

@@ -40,7 +40,7 @@
         <dependency>
             <groupId>cn.freemud</groupId>
             <artifactId>assortment-ordercenter-sdk</artifactId>
-            <version>2.2.3-SNAPSHOT</version>
+            <version>2.2.6-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>

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

@@ -623,23 +623,15 @@ public class OrderAdapter {
         if (Objects.nonNull(createOrderVo.getUnionPayCard())) {
             createOrderDto.setPayChannel(PayChannelType.USVCP.getEbcode());
             createOrderDto.setPayChannelName(PayChannelType.USVCP.getName());
+            createOrderDto.setPayChannelType(PayChannelType.USVCP.getIndex());
         }
-        //混合支付
-        else if (PayChannelType.COMB.getIndex().equals(createOrderVo.getPayChannelType())) {
-            createOrderDto.setPayChannel(PayChannelType.COMB.getEbcode());
-            createOrderDto.setPayChannelName(PayChannelType.COMB.getName());
-        }
-        else if (PayChannelType.WECHAT.getIndex().equals(createOrderVo.getPayChannelType())) {
-            createOrderDto.setPayChannel(PayChannelType.WECHAT.getEbcode());
-            createOrderDto.setPayChannelName(PayChannelType.WECHAT.getName());
-        }
-        else if (PayChannelType.ALIPAY.getIndex().equals(createOrderVo.getPayChannelType())) {
-            createOrderDto.setPayChannel(PayChannelType.ALIPAY.getEbcode());
-            createOrderDto.setPayChannelName(PayChannelType.ALIPAY.getName());
-        }
-        else if(StringUtils.isNotBlank(createOrderVo.getCardCode())){
-            createOrderDto.setPayChannel(PayChannelType.SVC.getEbcode());
-            createOrderDto.setPayChannelName(PayChannelType.SVC.getName());
+        if (StringUtils.isNotBlank(createOrderVo.getChannel())) {
+            PayChannelType channelType = PayChannelType.getByIndex(Byte.parseByte(createOrderVo.getChannel()));
+            if (channelType!=null) {
+                createOrderDto.setPayChannel(channelType.getEbcode());
+                createOrderDto.setPayChannelName(channelType.getName());
+                createOrderDto.setPayChannelType(channelType.getIndex());
+            }
         }
         createOrderDto.setSource(OrderSourceType.SAAS.getCode());
         createOrderDto.setSourceName(OrderSourceType.SAAS.getDesc());
@@ -1148,18 +1140,12 @@ public class OrderAdapter {
             responseVo.setPayCreateTime(orderExtInfoDto != null ? orderExtInfoDto.getPayDate() : "");
             responseVo.setPayChannel(ordersBean.getPayChannel());
             if (StringUtils.isNotBlank(ordersBean.getPayChannel())) {
-                if ("10102".equals(ordersBean.getPayChannel())) {
-                    responseVo.setOrderPayType("储值卡支付");
-                } else if (PayChannel.ALIPAY.getCode().equals(ordersBean.getPayChannel())) {
-                    responseVo.setOrderPayType("支付宝支付");
-                } else if (PayChannel.WXPAY.getCode().equals(ordersBean.getPayChannel())) {
-                    responseVo.setOrderPayType("微信支付");
-                }
-                else if (Objects.equals(PayChannel.USVCP.getCode(), ordersBean.getPayChannel())) {
-                    responseVo.setOrderPayType("电子风味卡支付");
+                PayChannelType ebcode = PayChannelType.getByEbcode(ordersBean.getPayChannel());
+                if (ebcode!=null) {
+                    responseVo.setOrderPayType(ebcode.getName());
                 }
                 else {
-                    responseVo.setOrderPayType("微信支付");
+                    responseVo.setOrderPayType(PayChannelType.WECHAT.getName());
                 }
             }
             else {

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

@@ -2518,6 +2518,7 @@ public class OrderServiceImpl implements Orderservice {
         return ResponseUtil.error(ResponseResultEnum.PAY_UNIFIED_ORDER_ERROR.getCode(),"获取混合预支付信息失败", null);
     }
     public OrderPayResponse getPreOrderPay(QueryOrdersResponse.DataBean.OrderBean orderBean, PaymentRequest paymentRequest, String trackingNo, Integer cardAmount, String transId, String partnerPayOvertime, OrderExtInfoDto orderExtInfoDto) {
+        OrderPayResponse orderPayResponse = null;
         try {
             UnifiedOrderRequest request = orderAdapter.convent2UnifiedOrderRequest(orderBean, paymentRequest, orderBean.getAmount(), cardAmount, transId, partnerPayOvertime);
             if (orderExtInfoDto != null && StringUtils.isNotBlank(orderExtInfoDto.getStationId())) {
@@ -2537,7 +2538,7 @@ public class OrderServiceImpl implements Orderservice {
                 orderPayResponse.setPartnerId(orderBean.getCompanyId());
                 orderPayResponse.setOrderId(orderBean.getOid());
                 orderPayResponse.setPayMode(PayChannelType.WECHAT.getEbcode());
-                if (orderPayResponse.getPayOrder()!=null) {
+                if (orderPayResponse.getPayOrder()!=null && StringUtils.isNotBlank(orderPayResponse.getPayOrder().getAliPayOrder())) {
                     orderPayResponse.setPayMode(PayChannelType.ALIPAY.getEbcode());
                 }
             }
@@ -2546,6 +2547,7 @@ public class OrderServiceImpl implements Orderservice {
             //TODO 邮件告警
             return null;
         }
+        return  orderPayResponse;
     }
 
     public OrderPayResponse svcPay(String cardCode, QueryOrdersResponse.DataBean.OrderBean orderBean, PaymentRequest paymentRequest, String transId, String trackingNo) {

order-management/pom.xml

@@ -65,7 +65,7 @@
         <dependency>
             <groupId>cn.freemud</groupId>
             <artifactId>assortment-ordercenter-sdk</artifactId>
-            <version>2.2.4-SNAPSHOT</version>
+            <version>2.2.6-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

shopping-cart-application-service/src/main/java/cn/freemud/entities/vo/ShoppingCartGoodsResponseVo.java

@@ -144,7 +144,7 @@ public class ShoppingCartGoodsResponseVo  extends ShoppingCartGoodsBaseResponseV
     /**
      * svc卡支付金额
      */
-    private Integer svcPayAmount;
+    private String svcPayAmount;
 
     /**
      * 各类券信息

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

@@ -1664,15 +1664,13 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
             deliveryAmount = shoppingCartGoodsResponseVo.getDiscountDeliveryAmount().intValue();
             orderAmount += deliveryAmount;
         }
-        log.info("svcPrice:totalAmount:{},orderAmount:{},deliveryAmount:{}",shoppingCartGoodsResponseVo.getTotalAmount().intValue(),orderAmount,deliveryAmount);
-
         if (svcTotalAmount>0 && svcTotalAmount>orderAmount) {
             svcPayAmount = orderAmount;
             shoppingCartGoodsResponseVo.setTotalAmount(0L);
         }
         else if (svcTotalAmount>0 && svcTotalAmount<=orderAmount) {
             svcPayAmount = svcTotalAmount;
-            shoppingCartGoodsResponseVo.setTotalAmount(orderAmount.longValue()-svcPayAmount.longValue());
+            shoppingCartGoodsResponseVo.setTotalAmount((orderAmount.longValue()-svcPayAmount.longValue()));
         }
         /**
         BigDecimal svcPayAmount = BigDecimal.ZERO;
@@ -1686,8 +1684,10 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
             shoppingCartGoodsResponseVo.setTotalAmount(deliveryAmount.longValue());
         }
          */
-        shoppingCartGoodsResponseVo.setSvcPayAmount(svcPayAmount);
-        shoppingCartGoodsResponseVo.setSvcDiscountDesc("储值卡支付￥" + svcPayAmount);
+        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);