预留代码 设置额外配送费操作

Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>

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

@@ -507,7 +507,7 @@ public class OrderController {
     @ApiAnnotation(logMessage = "couponOrderRefund")
     @PostMapping("/couponOrderRefund")
     public BaseResponse couponOrderRefund(@Validated @LogParams @RequestBody OrderRefundVo orderRefundVo) {
-        return orderservice.couponOrderRefund(orderRefundVo);
+        return orderservice.couponOrderRefund(orderRefundVo,0);
     }
 
 

order-application-service/src/main/java/cn/freemud/service/Orderservice.java

@@ -206,11 +206,12 @@ public interface Orderservice extends OrderFactoryService{
     BaseResponse<OrderInvoiceConfigVo> queryInvoiceConfig(GetInvoiceConfigRequest request);
 
     /**
-     *  卖券订单 申请退款
+     * 卖券订单 申请退款
      * @param orderRefundVo
+     * @param flag 0 用户调用 1系统调用
      * @return
      */
-    BaseResponse couponOrderRefund(OrderRefundVo orderRefundVo);
+    BaseResponse couponOrderRefund(OrderRefundVo orderRefundVo, int flag);
 
     /**
      *  卖券订单 申请退款 重试

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

@@ -98,14 +98,13 @@ import com.freemud.application.sdk.api.ordercenter.request.carpark.ParkingOrderC
 import com.freemud.application.sdk.api.ordercenter.response.BaseDownLoadResponse;
 import com.freemud.application.sdk.api.ordercenter.response.OrderBaseResp;
 import com.freemud.application.sdk.api.ordercenter.response.OrderCountResp;
-import com.freemud.application.sdk.api.ordercenter.response.orderInfo.*;
+import com.freemud.application.sdk.api.ordercenter.response.orderInfo.AfterSalesOrderResp;
 import com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderInfoReqs;
 import com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderPayItemResp;
 import com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderSettlementResp;
 import com.freemud.application.sdk.api.ordercenter.service.OrderDownLoadSdkService;
 import com.freemud.application.sdk.api.ordercenter.service.OrderSdkService;
 import com.freemud.application.sdk.api.storecenter.request.GetListByCodesRequest;
-import com.freemud.application.sdk.api.storecenter.request.StoreInfoRequest;
 import com.freemud.application.sdk.api.storecenter.response.GetListByCodesResponse;
 import com.freemud.application.sdk.api.storecenter.response.StoreResponse;
 import com.freemud.application.sdk.api.storecenter.service.StoreCenterService;
@@ -3372,17 +3371,10 @@ public class OrderServiceImpl implements Orderservice {
 
 
     @Override
-    public BaseResponse couponOrderRefund(OrderRefundVo orderRefundVo) {
+    public BaseResponse couponOrderRefund(OrderRefundVo orderRefundVo, int flag) {
         if (StringUtils.isEmpty(orderRefundVo.getReason())) {
             orderRefundVo.setReason("退款");
         }
-        // 校验用户是否登录
-        BaseResponse<AssortmentCustomerInfoVo> baseResponse = this.checkUserLoginInfoDto(orderRefundVo.getSessionId());
-        if (!Objects.equals(baseResponse.getCode(), ResponseResult.SUCCESS.getCode())) {
-            return baseResponse;
-        }
-        AssortmentCustomerInfoVo userLoginInfoDto = baseResponse.getResult();
-
         // 查询订单
         BaseResponse<OrderBeanV1> orderResponse = this.checkOrderAndGetOrderBean(orderRefundVo.getOid());
         if (!Objects.equals(orderResponse.getCode(), ResponseResult.SUCCESS.getCode())) {
@@ -3390,6 +3382,20 @@ public class OrderServiceImpl implements Orderservice {
         }
         OrderBeanV1 orderBean = orderResponse.getResult();
 
+        AssortmentCustomerInfoVo userLoginInfoDto;
+        if (flag > 0) {
+            userLoginInfoDto = new AssortmentCustomerInfoVo();
+            userLoginInfoDto.setMemberId(orderBean.getUserId());
+            userLoginInfoDto.setWxAppId(orderBean.getAppId());
+        }else {
+            // 校验用户是否登录
+            BaseResponse<AssortmentCustomerInfoVo> baseResponse = this.checkUserLoginInfoDto(orderRefundVo.getSessionId());
+            if (!Objects.equals(baseResponse.getCode(), ResponseResult.SUCCESS.getCode())) {
+                return baseResponse;
+            }
+            userLoginInfoDto = baseResponse.getResult();
+        }
+
         // 校验操作
         BaseResponse checkResult = this.couponOrderRefundCheck(userLoginInfoDto, orderBean);
         if (!Objects.equals(checkResult.getCode(), ResponseResult.SUCCESS.getCode())) {
@@ -3445,7 +3451,7 @@ public class OrderServiceImpl implements Orderservice {
         List<String> responsDTOData = responsDTO.getData();
         if (CollectionUtils.isEmpty(responsDTOData) || !responsDTOData.containsAll(couponCodeList)) {
             // fisherman 文案让产品提供
-            return ResponseUtil.error(ResponseResult.OPERATE_NOT_SUPPORT, "用户优惠券发生变动,无法退款");
+            return ResponseUtil.error(ResponseResult.OPERATE_NOT_SUPPORT, "您购买的优惠券已锁定，请先进行解锁操作再退款");
         }
         return ResponseUtil.success();
     }