合并后报错修改

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

@@ -23,7 +23,7 @@ import cn.freemud.entities.dto.delivery.DeliveryBaseResponse;
 import cn.freemud.entities.dto.delivery.GetDeliveryFlagRequest;
 import cn.freemud.entities.dto.delivery.GetDeliveryFlagResponseDto;
 import cn.freemud.entities.dto.order.BusinessDate;
-import cn.freemud.entities.dto.order.FacePayResponseDto;
+import cn.freemud.entities.dto.order.UnifiedPayResponseDto;
 import cn.freemud.entities.dto.pay.PayOrderDto;
 import cn.freemud.entities.dto.pay.PayProductDto;
 import cn.freemud.entities.dto.pay.UnifiedOrderRequestDto;
@@ -33,11 +33,7 @@ import cn.freemud.entities.dto.store.*;
 import cn.freemud.entities.dto.user.CustomerPropertyBaseResponse;
 import cn.freemud.entities.dto.user.GetSvcInfoByMemberIdResponseVo;
 import cn.freemud.entities.dto.user.StatisticalScoreRequestVo;
-import cn.freemud.entities.vo.CreateOrderResponseVo;
-import cn.freemud.entities.vo.CreateOrderVo;
-import cn.freemud.entities.vo.GetMemberCouponRequestVo;
-import cn.freemud.entities.vo.SellCouponCreateOrderVo;
-import cn.freemud.entities.vo.ShoppingCartInfoRequestVo;
+import cn.freemud.entities.vo.*;
 import cn.freemud.enums.*;
 import cn.freemud.interceptor.ServiceException;
 import cn.freemud.manager.StoreTableNumberManager;
@@ -1435,7 +1431,7 @@ public class CheckOrder {
         return foodOrderType;
     }
 
-    public void convent2CreateOrderResponseVo(CreateOrderResponseVo createOrderResponseVo, String appId, FacePayResponseDto response){
+    public void convent2CreateOrderResponseVo(CreateOrderResponseVo createOrderResponseVo, String appId, UnifiedPayResponseDto response){
         createOrderResponseVo.setWxappId(appId);
         createOrderResponseVo.setFmId(response.getFmId());
         createOrderResponseVo.setPaySuccess(false);

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

@@ -15,7 +15,7 @@ import cn.freemud.entities.dto.coupon.CouponResponseDTO;
 import cn.freemud.entities.dto.coupon.FastBatchQueryTemplateInfoRequest;
 import cn.freemud.entities.dto.coupon.FastTemplateInfoResponseVO;
 import cn.freemud.entities.dto.order.CreatePrepayRequestDto;
-import cn.freemud.entities.dto.order.FacePayResponseDto;
+import cn.freemud.entities.dto.order.UnifiedPayResponseDto;
 import cn.freemud.entities.dto.pay.UnifiedOrderRequestDto;
 import cn.freemud.entities.dto.product.GetValidateProductInfoDto;
 import cn.freemud.entities.dto.product.ProductInfo;
@@ -475,7 +475,7 @@ public class SellCouponOrderServiceImpl implements OrderFactoryService {
         CreateOrderResponseVo createOrderResponseVo = new CreateOrderResponseVo();
         createOrderResponseVo.setOid(orderCode);
         //线上现金支付，创建预支付订单，唤起支付
-        com.freemud.application.sdk.api.base.BaseResponse<FacePayResponseDto> response = null;
+        com.freemud.application.sdk.api.base.BaseResponse<UnifiedPayResponseDto> response = null;
         Long payClientCode = Long.parseLong(wxAppStore.getClientCode());
         //实际支付金额
         Long cashPrice = createOrderRequest.getSettlementAmount();