Merge branch 'feature/2020/09/23-1.9.39.1-修订版-张志恒' into develop

order-application-service/pom.xml

@@ -89,7 +89,7 @@
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>
             <artifactId>deliverycenter-sdk</artifactId>
-            <version>1.5.2-SNAPSHOT</version>
+            <version>1.6.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>

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

@@ -1598,8 +1598,6 @@ public class OrderServiceImpl implements Orderservice {
                 sendApplyRefundSubscriptionNotice(orderBean, orderRefundVo);
                 //已接单可发起退款申请，查询门店有无云打印机，有则打印退款申请小票
                 printApplyRefundSmallTicket(orderBean, orderRefundVo);
-                //发送消息，冲正券
-                backOrdersStatusChange(orderBean.getOid(), orderBean.getStatus(),orderBean.getPayStatus());
             }
         }
         return ResponseUtil.success();
@@ -2191,8 +2189,10 @@ public class OrderServiceImpl implements Orderservice {
             BaseResponse baseResponse = failPreOrderPay(LogThreadLocal.getTrackingNo(), createPrepayRequestDto.getProductOrderBean(), cardCode, createPrepayRequestDto.getOrderClient(),
                     Objects.isNull(orderPayResponse) ? null : orderPayResponse.getMsg());
             // 电子风味卡需要给用户特殊的返回
-            if (totalAmount > 0 && Objects.nonNull(createPrepayRequestDto.getUnionPayCard()) && Objects.nonNull(orderPayResponse)) {
-                baseResponse.setMessage((ResponseCodeConstant.PASSWORD_WRONG.equals(orderPayResponse.getPayTransId()) || ResponseCodeConstant.NOT_SUFFICIENT_FUND.equals(orderPayResponse.getPayTransId())) ?
+            if (totalAmount > 0 && Objects.nonNull(createPrepayRequestDto.getUnionPayCard())) {
+                baseResponse.setMessage(Objects.nonNull(orderPayResponse) &&
+                        (ResponseCodeConstant.PASSWORD_WRONG.equals(orderPayResponse.getPayTransId())
+                                || ResponseCodeConstant.NOT_SUFFICIENT_FUND.equals(orderPayResponse.getPayTransId())) ?
                         orderPayResponse.getMsg() : "支付失败");
             }
             return baseResponse;
@@ -2671,8 +2671,10 @@ public class OrderServiceImpl implements Orderservice {
             BaseResponse baseResponse = failPreOrderPay(LogThreadLocal.getTrackingNo(), productOrderBean, createOrderVo.getCardCode(), null,
                     Objects.isNull(orderPayResponse) ? null : orderPayResponse.getMsg());
             // 电子风味卡需要给用户特殊的返回
-            if (totalAmount > 0 && Objects.nonNull(createOrderVo.getUnionPayCard()) && Objects.nonNull(orderPayResponse)) {
-                baseResponse.setMessage((ResponseCodeConstant.PASSWORD_WRONG.equals(orderPayResponse.getPayTransId()) || ResponseCodeConstant.NOT_SUFFICIENT_FUND.equals(orderPayResponse.getPayTransId())) ?
+            if (totalAmount > 0 && Objects.nonNull(createOrderVo.getUnionPayCard())) {
+                baseResponse.setMessage(Objects.nonNull(orderPayResponse) &&
+                        (ResponseCodeConstant.PASSWORD_WRONG.equals(orderPayResponse.getPayTransId())
+                                || ResponseCodeConstant.NOT_SUFFICIENT_FUND.equals(orderPayResponse.getPayTransId())) ?
                         orderPayResponse.getMsg() : "支付失败");
             }
             return baseResponse;

order-management/pom.xml

@@ -95,7 +95,7 @@
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>
             <artifactId>deliverycenter-sdk</artifactId>
-            <version>1.5.2-SNAPSHOT</version>
+            <version>1.6.RELEASE</version>
             <scope>provided</scope>
         </dependency>
         <dependency>