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

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

@@ -2198,8 +2198,9 @@ public class OrderServiceImpl implements Orderservice {
             // 0元订单如果不需要支付，自定义支付单号
             orderPayResponse = getOrderPayResponse(paymentRequest, createPrepayRequestDto.getFatherOrderBean());
         }
-        if (orderPayResponse == null) {
-            return failPreOrderPay(LogThreadLocal.getTrackingNo(), createPrepayRequestDto.getProductOrderBean(), cardCode, createPrepayRequestDto.getOrderClient());
+        if (orderPayResponse == null || Objects.isNull(orderPayResponse.getFmId())) {
+            return failPreOrderPay(LogThreadLocal.getTrackingNo(), createPrepayRequestDto.getProductOrderBean(), cardCode, createPrepayRequestDto.getOrderClient(),
+                    Objects.isNull(orderPayResponse) ? null : orderPayResponse.getMsg());
         }
         createOrderResponse = orderAdapter.convent2CreateFatherSonOrderResponseVo(orderPayResponse, createPrepayRequestDto.getProductOrderBean());
         BaseResponse baseEditResponse = this.updateOrderInfo(orderPayResponse, createPrepayRequestDto.getOrderExtInfoDTO(), createPrepayRequestDto.getProductOrderBean(), LogThreadLocal.getTrackingNo());
@@ -2322,12 +2323,12 @@ public class OrderServiceImpl implements Orderservice {
         return orderPayResponse;
     }
 
-    private BaseResponse failPreOrderPay(String trackingNo, QueryOrdersResponse.DataBean.OrderBean orderBean, String cardCode, OrderClientType orderClient) {
+    private BaseResponse failPreOrderPay(String trackingNo, QueryOrdersResponse.DataBean.OrderBean orderBean, String cardCode, OrderClientType orderClient, String msg) {
         List<OrderClientType> notCancelOrderClientList = Lists.newArrayList(OrderClientType.APP);
         if(!notCancelOrderClientList.contains(orderClient)) {
             //失败冲正库存，冲正活动库存，取消订单
             CancelOrderRequest cancelOrderRequest = orderAdapter.convent2CancelOrderRequest(orderBean.getOid(), orderBean.getCompanyId(),
-                    AfterSalesType.SYSTEM_CANCEL, "获取预支付失败", trackingNo, null);
+                    AfterSalesType.SYSTEM_CANCEL, StringUtils.defaultIfBlank(msg,"获取预支付失败"), trackingNo, null);
             orderCenterSdkService.orderCancel(cancelOrderRequest);
             // TODO: 2019/9/10 hubowen mq推送变更
             backOrdersStatusChange(orderBean.getOid(), orderBean.getStatus());
@@ -2659,7 +2660,8 @@ public class OrderServiceImpl implements Orderservice {
             if(createOrderVo.getFaceCode() != null){
                 createOrderVo.setCardCode(createOrderVo.getFaceCode());
             }
-            return failPreOrderPay(LogThreadLocal.getTrackingNo(), productOrderBean, createOrderVo.getCardCode(), null);
+            return failPreOrderPay(LogThreadLocal.getTrackingNo(), productOrderBean, createOrderVo.getCardCode(), null,
+                    Objects.isNull(orderPayResponse) ? null : orderPayResponse.getMsg());
         }
         //更新订单extinfo信息
         BaseResponse baseEditResponse = this.updateOrderInfo(orderPayResponse, orderExtInfoDTO, productOrderBean, LogThreadLocal.getTrackingNo());
@@ -3032,7 +3034,8 @@ public class OrderServiceImpl implements Orderservice {
             orderPayResponse = comPayOrder(createPrepayRequestDto.getOrderPayItemCreateReqList(),createPrepayRequestDto.getFatherOrderBean(), paymentRequest, LogThreadLocal.getTrackingNo(),createPrepayRequestDto.getCardAmount(),partnerPayOvertime);
         }
         if (orderPayResponse == null || Objects.isNull(orderPayResponse.getFmId())) {
-            return failPreOrderPay(LogThreadLocal.getTrackingNo(), createPrepayRequestDto.getProductOrderBean(), cardCode, createPrepayRequestDto.getOrderClient());
+            return failPreOrderPay(LogThreadLocal.getTrackingNo(), createPrepayRequestDto.getProductOrderBean(), cardCode, createPrepayRequestDto.getOrderClient(),
+                    Objects.isNull(orderPayResponse) ? null : orderPayResponse.getMsg());
         }
         createOrderResponse = orderAdapter.convent2CreateFatherSonOrderResponseVo(orderPayResponse, createPrepayRequestDto.getProductOrderBean());
         BaseResponse baseEditResponse = this.updateOrderInfo(orderPayResponse, createPrepayRequestDto.getOrderExtInfoDTO(), createPrepayRequestDto.getProductOrderBean(), LogThreadLocal.getTrackingNo());

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/calculation/CouponDiscountCalculation.java

@@ -343,6 +343,7 @@ public class CouponDiscountCalculation {
                         couponProductVo.setKeyProductCode(comboxGoods.getCustomerCode());
                         couponProductVo.setQuantity(comboxGoods.getQty());
                         couponProductVo.setProductId(comboxGoods.getGoodsId());
+                        couponProductVo.setCouponCode(cartGood.getCouponCode());
                         couponProductVo.setCategoryCode(null);
                         productList.add(couponProductVo);
                     });
@@ -354,6 +355,7 @@ public class CouponDiscountCalculation {
                         couponProductVo.setKeyProductCode(comboxGoods.getCustomerCode());
                         couponProductVo.setQuantity(comboxGoods.getQty());
                         couponProductVo.setProductId(comboxGoods.getGoodsId());
+                        couponProductVo.setCouponCode(cartGood.getCouponCode());
                         couponProductVo.setCategoryCode(null);
                         productList.add(couponProductVo);
                     });
@@ -368,8 +370,6 @@ public class CouponDiscountCalculation {
     }
 
 
-
-
 //    public String getAppSecret(String partnerId) {
 //        // 获取券服务的密钥
 //        String couponAppSecret = RedisUtil.getCouponAppSecret(partnerId);

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/entity/CouponProductVo.java

@@ -22,6 +22,6 @@ public class CouponProductVo {
     private String productId;
     private Integer amount;
     private Integer quantity;
-
+    private String couponCode;
     private String categoryCode;
 }