Merge remote-tracking branch 'origin/feature/xukang_20211201_虚拟订单退款' into…

Merge remote-tracking branch 'origin/feature/xukang_20211201_虚拟订单退款' into feature/xukang_20211201_虚拟订单退款

order-application-service/src/main/java/cn/freemud/controller/OrderController.java

@@ -528,8 +528,8 @@ public class OrderController {
      * @param
      * @return
      */
-    @ApiAnnotation(logMessage = "reportSendOrderCount")
-    @GetMapping("/reportSendOrderCount")
+    @ApiAnnotation(logMessage = "couponOrderAutoRefund")
+    @GetMapping("/couponOrderAutoRefund")
     public BaseResponse couponOrderAutoRefund() throws Exception {
         AppLogUtil.infoLog("卖券订单券过期自动退款 ",null,null);
         couponOrderAutoRefundHandler.execute(null);

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

@@ -3558,10 +3558,24 @@ public class OrderServiceImpl implements Orderservice {
 
             if(Integer.valueOf(1).equals(queryRefundFailuresListDto.getLastFailureType())) {
                 Long refundId = System.currentTimeMillis();
+
+                if (orderBean.getAmount() != 0) {
+                    if (null != orderBean.getOrderPayItem() && orderBean.getOrderPayItem().size() > 0) {
+                        //调用支付退款
+                        MultiOrderRefundRequest multiOrderRefundRequest = orderAdapter.getMultiOrderPayRefundRequest(orderBean, refundId);
+                        MultiOrderRefundResponse multiOrderRefundResponse = payServiceImpl.paymentApplicationRefund(multiOrderRefundRequest, orderBean.getCompanyId());
+                        if (multiOrderRefundResponse == null || multiOrderRefundResponse.getData() == null || !ResponseCodeConstant.RESPONSE_SUCCESS_STR.equals(multiOrderRefundResponse.getCode())) {
+                            return ResponseUtil.error(ResponseResult.ORDER__ERRORREFUND.getCode(), "调用支付退款接口失败："+JSON.toJSONString(multiOrderRefundResponse));
+                        }
+                        List<MultiOrderRefundResponse.RefundPlatformResponse> refundPlatformResponseList = multiOrderRefundResponse.getData().refundPlatformResponseList;
+                        if (null != refundPlatformResponseList && refundPlatformResponseList.size() > 0) {
+                            redisCache.save(RedisUtil.getPaymentTransIdSequenceKey(refundPlatformResponseList.get(0).getTransId()), orderBean.getOid(), 1L, TimeUnit.DAYS);
+                        }
+                    } else {
                         //调用支付退款
                         PayRefundRequestDto orderPayRefundRequest = orderAdapter.getOrderPayRefundRequest(orderBean, refundId, orderBean.getOid());
                         //抖音支付退款必传
-                orderPayRefundRequest.setRefundDesc("重试退款");
+                        orderPayRefundRequest.setRefundDesc("退款失败人工重试");
                         com.freemud.application.sdk.api.base.BaseResponse<OrderRefundResponse> response = payServiceImpl.orderRefund(orderPayRefundRequest);
                         if (response == null || response.getData() == null || !ResponseCodeConstant.RESPONSE_SUCCESS_STR.equals(response.getCode())) {
                             return ResponseUtil.error(ResponseResult.ORDER__ERRORREFUND.getCode(), "调用支付退款接口失败："+JSON.toJSONString(response));
@@ -3569,6 +3583,8 @@ public class OrderServiceImpl implements Orderservice {
                         if(!ResponseConstant.SUCCESS_RESPONSE_CODE.equals(response.getData().getStatusCode())) {
                             return ResponseUtil.error(ResponseResult.ORDER__ERRORREFUND.getCode(), "支付退款失败："+JSON.toJSONString(response));
                         }
+                    }
+                }
 
                 RefundFailuresSuccessfulReq refundFailuresSuccessfulReq = new RefundFailuresSuccessfulReq();
                 refundFailuresSuccessfulReq.setId(orderRefundRetryVo.getId());
@@ -3584,7 +3600,7 @@ public class OrderServiceImpl implements Orderservice {
                 request.setPartnerId(orderBean.getCompanyId());
                 request.setOrderClient(Integer.parseInt(orderBean.getOrderClient()));
                 request.setAfterSalesCode(afterSalesOrderResp.getAfterSalesCode());
-                request.setAfterSerialNo(String.valueOf(orderPayRefundRequest.getRefundId()));
+                request.setAfterSerialNo(String.valueOf(refundId));
                 request.setAdultRemark("重试退款");
                 request.setOperator("技术支持");
                 OrderBaseResp orderBaseResp = orderSdkService.adultApproveWithRefundComplete(request, LogThreadLocal.getTrackingNo());
@@ -3593,6 +3609,8 @@ public class OrderServiceImpl implements Orderservice {
                     return ResponseUtil.error(ResponseResult.ORDER__ERRORREFUND.getCode(), "基础服务订单退款完成失败");
                 }
 
+            } else {
+                return ResponseUtil.error(ResponseResult.ORDER__ERRORREFUND.getCode(), "暂不支持该操作");
             }
 
         } catch (Exception e) {