Merge branch 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa

order-application-service/pom.xml

@@ -331,12 +331,12 @@
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>
             <artifactId>paymentcenter-sdk</artifactId>
-            <version>2.9.10.RELEASE</version>
+            <version>2.9.14-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.freemud.sdk.api.assortment</groupId>
             <artifactId>assortment-payment-sdk</artifactId>
-            <version>2.6.8.RELEASE</version>
+            <version>2.6.8.SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.rocketmq</groupId>

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

@@ -217,7 +217,7 @@ public class McCafePushOrderDto {
         //退款类型枚举 1: 整单退款
         private String refundType;
         //退款金额
-        private Integer refundAmount;
+        private Integer refundAmount = 0;
         //退款时间 yyyy-MM-dd HH:mm:ss
         private String refundTime;
         //退款原因

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

@@ -125,7 +125,9 @@ import cn.freemud.service.mccafe.CouponClientService;
 import cn.freemud.service.mccafe.MCCafeOrderCenterSdkService;
 import com.freemud.sdk.api.assortment.order.service.OrderCenterSdkService;
 import com.freemud.sdk.api.assortment.order.vo.ProductGroupVo;
+import com.freemud.sdk.api.assortment.payment.request.OrderRefundQueryRequest;
 import com.freemud.sdk.api.assortment.payment.request.UnifiedOrderRequest;
+import com.freemud.sdk.api.assortment.payment.response.OrderRefundQueryResponse;
 import com.freemud.sdk.api.assortment.payment.response.OrderRefundResponse;
 import com.freemud.sdk.api.assortment.payment.response.UnifiedOrderResponse;
 import com.freemud.sdk.api.assortment.payment.service.PaymentCenterService;
@@ -2570,6 +2572,16 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
                         pushMccafeOrderManager.insertOrder(pushMccafeOrder);
 
 
+                    } catch (ServiceException e) {
+                        AppLogUtil.errorLog("麦咖啡历史订单推送失败: "+JSON.toJSONString(orderInfoReqs)
+                                +" 异常信息: "+e.getMessage(),null,null,e);
+                        PushMccafeOrder pushMccafeOrder = new PushMccafeOrder();
+                        pushMccafeOrder.setOrderCode(orderInfoReqs.getOrderCode());
+                        pushMccafeOrder.setPartnerId(orderInfoReqs.getPartnerId());
+                        pushMccafeOrder.setStoreId(orderInfoReqs.getStoreId());
+                        pushMccafeOrder.setStatus(0);
+                        pushMccafeOrder.setFailReason(e.getMessage());
+                        pushMccafeOrderManager.insertOrder(pushMccafeOrder);
                     } catch (Exception e) {
                         AppLogUtil.errorLog("麦咖啡历史订单推送失败: "+JSON.toJSONString(orderInfoReqs)
                                 +" 异常信息: "+ExceptionUtils.getExceptionInfo(e),null,null,e);
@@ -2777,17 +2789,18 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
                 orderPayment.setRefundReason(afterSalesOrderRespOptional.get().getAfterSalesReason());
             }
             orderPayment.setRefundStatus("REFUNDED");
-//            OrderRefundQueryRequest orderRefundQueryRequest = new OrderRefundQueryRequest();
-//            orderRefundQueryRequest.setOrgTransId(orderInfoReqs.getOrderCode());
-//            orderRefundQueryRequest.setOrgPayFmId(orderExtInfoDto.getFmId());
-//            com.freemud.application.sdk.api.base.BaseResponse<OrderRefundQueryResponse> refundQueryResponseBaseResponse =
-//                    paymentCenterService.orderRefundQuery(orderRefundQueryRequest, LogThreadLocal.getTrackingNo());
-//            if(ResponseConstant.SUCCESS_RESPONSE_CODE_STR.equals(refundQueryResponseBaseResponse.getCode())
-//                    && null != refundQueryResponseBaseResponse.getData()
-//                    && ResponseConstant.SUCCESS_RESPONSE_CODE.equals(refundQueryResponseBaseResponse.getData().getStatusCode())) {
-//                orderPayment.setChannelRefundTransactionId(refundQueryResponseBaseResponse.getData().getRefundDetail().get(0).getEndTransId());
-//            }
-            orderPayment.setChannelRefundTransactionId(UUID.randomUUID().toString());
+            OrderRefundQueryRequest orderRefundQueryRequest = new OrderRefundQueryRequest();
+            orderRefundQueryRequest.setOrgTransId(orderInfoReqs.getOrderCode());
+            orderRefundQueryRequest.setOrgPayFmId(orderExtInfoDto.getFmId());
+            com.freemud.application.sdk.api.base.BaseResponse<OrderRefundQueryResponse> refundQueryResponseBaseResponse =
+                    paymentCenterService.orderRefundQuery(orderRefundQueryRequest, LogThreadLocal.getTrackingNo());
+            if(ResponseConstant.SUCCESS_RESPONSE_CODE_STR.equals(refundQueryResponseBaseResponse.getCode())
+                    && null != refundQueryResponseBaseResponse.getData()
+                    && ResponseConstant.SUCCESS_RESPONSE_CODE.equals(refundQueryResponseBaseResponse.getData().getStatusCode())) {
+                orderPayment.setChannelRefundTransactionId(refundQueryResponseBaseResponse.getData().getRefundDetail().get(0).getEndTransId());
+            } else {
+                throw new ServiceException(ResponseResult.SYSTEM_BUSINESS_ERROR, "获取退款三方流水号失败");
+            }
 
 
         }

order-management/pom.xml

@@ -65,13 +65,13 @@
         <dependency>
             <groupId>com.freemud.sdk.api.assortment</groupId>
             <artifactId>assortment-payment-sdk</artifactId>
-            <version>2.6.8.RELEASE</version>
+            <version>2.6.8.SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>
             <artifactId>paymentcenter-sdk</artifactId>
-            <version>2.9.8.RELEASE</version>
+            <version>2.9.14-SNAPSHOT</version>
         </dependency>
         <dependency>
             <artifactId>structure-center-sdk</artifactId>

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/calculate/promotion/CouponSharingService.java

@@ -8,8 +8,6 @@ import cn.freemud.enums.AvailableCouponQueryFlagEnum;
 import cn.freemud.enums.GoodsTypeEnum;
 import cn.freemud.service.CouponService;
 import cn.freemud.service.impl.AssortmentSdkService;
-import com.alibaba.fastjson.JSON;
-import com.freemud.application.sdk.api.log.ApiLog;
 import com.freemud.sdk.api.assortment.shoppingcart.constant.CommonsConstant;
 import com.freemud.sdk.api.assortment.shoppingcart.service.impl.ShoppingCartBaseServiceImpl;
 import com.google.common.collect.Lists;
@@ -129,7 +127,6 @@ public class CouponSharingService {
                 }
             }
         }
-        ApiLog.printLog("优惠券问题处理 fisherman-------->", JSON.toJSONString(cartGoodsList),JSON.toJSONString(validCouponMap),JSON.toJSONString(calculationDiscountResult));
         //循环购物车商品券
         for (CartGoods cartGoods : cartGoodsList) {
             if (StringUtils.isNotBlank(cartGoods.getCouponCode()) || cartGoods.getCartGoodsUid().startsWith(CommonsConstant.COUPON_PREFIX)) {