Merge branch 'KA-技术优化-支付成功回调处理订单已取消的场景' into qa

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

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

@@ -18,7 +18,7 @@ import cn.freemud.entities.vo.order.PaymentConfigVo;
 import cn.freemud.entities.vo.order.PlugInParameter;
 import cn.freemud.enums.*;
 import cn.freemud.interceptor.ServiceException;
-import cn.freemud.management.entities.dto.request.order.RefundSuccessCallbackVo;
+import cn.freemud.management.service.handle.PaymentHandle;
 import cn.freemud.management.service.handle.SaasOrderHandle;
 import cn.freemud.management.thirdparty.OrderCallbackClient;
 import cn.freemud.manager.OpenPlatformOrderConfigManager;
@@ -169,6 +169,8 @@ public class OrderAdapterServiceImpl {
     private  EcologyProgramApplicationClient ecologyProgramApplicationClient;
     @Autowired
     private EmailAlertService emailAlertService;
+    @Autowired
+    private PaymentHandle paymentHandle;
 
     //获取下单实现对象
     private OrderFactoryService getCreateOrderBean(AssortmentCustomerInfoVo assortmentCustomerInfoVo, CreateOrderVo createOrderVo) {
@@ -327,10 +329,17 @@ public class OrderAdapterServiceImpl {
                 return orderAdapter.sendPaySuccessNoticeMessage();
             }
             Integer client = Integer.parseInt(orderBean.getOrderClient());
-            //若是app订单超时回调了 订单已取消则做退款处理
-            if (NewOrderStatus.CLOSED.getIndex().equals(orderBean.getStatusV2()) && Arrays.asList(autoRefundClient.split(",")).contains(client.toString())
+            //若是订单超时回调了 订单已取消则做退款处理
+            if (NewOrderStatus.CLOSED.getIndex().equals(orderBean.getStatusV2())
+                    && Arrays.asList(autoRefundClient.split(",")).contains(client.toString())
                     && Arrays.asList(autoRefundPartnerId.split(",")).contains(orderBean.getCompanyId())) {
-                orderServiceImpl.timeOutRefund(orderBean);
+                cn.freemud.management.entities.dto.request.order.OrderManagerRequest request = new cn.freemud.management.entities.dto.request.order.OrderManagerRequest();
+                request.setOrderId(orderBean.getOid());
+                request.setPartnerId(orderBean.getCompanyId());
+                request.setReason("处理订单已关闭,支付未及时回调");
+                request.setOperator("order-application-service");
+                // 直接退款就行, 其他的资产已经被退回
+                paymentHandle.getCommonPayRefundResponse(request,orderBean);
                 return orderAdapter.sendPaySuccessNoticeMessage();
             }
             // 支付成功处理

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

@@ -2317,7 +2317,7 @@ public class OrderServiceImpl implements Orderservice {
             messageTemplateRequest.setMessageEventType(messageEventType);
             com.freemud.application.sdk.api.base.BaseResponse baseResponse = this.messageTemplatePushService.sendTemplateMsg(messageTemplateRequest);
             if (!Objects.equals(baseResponse.getCode(), ResponseResultEnum.SUCCESS.getCode())) {
-                AppLogUtil.errorLog("发送支付成功模板消息 失败", orderBean.getOid(), JSON.toJSONString(baseResponse), null);
+                AppLogUtil.printLog("发送支付成功模板消息 失败", orderBean.getOid(), JSON.toJSONString(baseResponse));
             }
         } catch (Exception e) {
             AppLogUtil.errorLog("sendTemplateMsg_error", JSONObject.toJSONString(orderBean), JSONObject.toJSONString(messageTemplateRequest), e);
@@ -2808,30 +2808,23 @@ public class OrderServiceImpl implements Orderservice {
         if (abState.equals(orderBean.getAbnormalState())) {
             return;
         }
-        com.freemud.application.sdk.api.base.BaseResponse<OrderRefundResponse> response = null;
-        Long refundId = System.currentTimeMillis();
-        OrderExtInfoDto orderExtInfoDTO = gson.fromJson(orderBean.getExtInfo(), OrderExtInfoDto.class);
-        if (orderExtInfoDTO == null || StringUtils.isBlank(orderExtInfoDTO.getFmId())) {
-            return;
-        }
-        Integer state = PayRefundStatus.SUCCESS.getCode();
-        orderBean.setPayVoucher(orderExtInfoDTO.getFmId());
+        OrderManagerRequest request = new OrderManagerRequest();
+        request.setReason("订单已关闭,支付未及时回调");
+        Integer state = com.freemud.sdk.api.assortment.order.enums.PayRefundStatus.SUCCESS.getCode();
+        PayRefundResponse commonPayRefundResponse = paymentHandle.getCommonPayRefundResponse(request, orderBean);
+        com.freemud.sdk.api.assortment.order.enums.PayRefundStatus payRefundStatus = commonPayRefundResponse.getPayRefundStatus();
+
         SdkUpdateAbnormalState sdkUpdateAbnormalState = new SdkUpdateAbnormalState();
         String desc = "支付未及时回调";
-
-        PayRefundRequestDto orderPayRefundRequest = orderAdapter.getOrderPayRefundRequest(orderBean, refundId, orderBean.getOid());
-        // TODO: 22-6-23 待联调修改
-        response = payServiceImpl.orderRefund(orderPayRefundRequest);
-//        OrderManagerRequest request = new OrderManagerRequest();
-//        request.setReason(desc);
-//        PayRefundResponse response = payServiceImpl.payRefundCommon(request, orderBean);
-        if (response != null && noPay.equals(response.getCode())) {
-            return;
-        }
-        if (response != null || state.equals(response.getData().getRefundStatus())) {
+        switch (payRefundStatus){
+            case SUCCESS:
                 sdkUpdateAbnormalState.setAbnormalDesc(desc + ",退款成功");
-        } else {
+                break;
+            case FAIL:
                 sdkUpdateAbnormalState.setAbnormalDesc(desc + ",退款失败");
+                break;
+            default:
+                sdkUpdateAbnormalState.setAbnormalDesc(desc + ",等待支付回调中");
         }
         sdkUpdateAbnormalState.setPartnerId(orderBean.getCompanyId());
         sdkUpdateAbnormalState.setAbnormalState(4);

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

@@ -121,7 +121,7 @@ public class CalculationSharingEquallyService {
         Goods find = null;
         for (CartGoods product : shoppingCartGoodsResponseVo.getProducts()) {
             if (goods!=null) {
-                find = goods.stream().filter((k) -> k.getCartGoodsUid().equals(product.getCartGoodsUid())).findFirst().get();
+                find = goods.stream().filter((k) -> k.getCartGoodsUid().equals(product.getCartGoodsUid())).findFirst().orElseGet(null);
             }
             ShoppingCartGoodsDto.CartGoodsDetailDto cartGoodsDetailDto = calculationCommonService.convertCartGoods2DetailGoodsList(find, product,shoppingCartInfoRequestVo.getPartnerId());
             cartGoodsDetailDtoList.add(cartGoodsDetailDto);