积分商品

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/BaseCreateOrderRequest.java

@@ -117,6 +117,8 @@ public class BaseCreateOrderRequest extends BaseConfig {
      * 实付金额
      */
     private Long amount;
+
+    private Long totalScore;
     //桌号
     private String barCounter;
     /**

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/service/OrderCenterSdkService.java

@@ -15,11 +15,13 @@ public interface OrderCenterSdkService {
      *
      * @return
      */
-    public CreateOrderResponse createOrderFlow(CreateOrderRequest createOrderRequest);
+    @Deprecated
+    CreateOrderResponse createOrderFlow(CreateOrderRequest createOrderRequest);
 
     /**
      * 创建父子订单
      */
+    @Deprecated
     CreateFatherSonOrderResponse createFatherSonOrder(CreateFatherSonOrderRequest createFatherSonOrderRequest);
 
     CreateOrderResponse createOrder(BaseCreateOrderRequest baseCreateOrderRequest);
@@ -27,6 +29,7 @@ public interface OrderCenterSdkService {
     /**
      * 订单支付确认 C端
      */
+    @Deprecated
     PayAccessResponse payAccess(ConfirmOrderRequest confirmOrderRequest);
 
     /**

order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java

@@ -176,7 +176,6 @@ public class OrderAdapter {
      * @return
      */
     public BaseCreateOrderRequest convent2CreateOrderDto(CreateOrderVo createOrderVo, ShoppingCartGoodsDto shoppingCartGoodsDto, StoreResponse.BizVO storeResponseDto) {
-//        UserDeliveryInfoDto deliveryInfoDto = createOrderVo.getUserDeliveryInfoDto();
         BaseCreateOrderRequest createOrderDto = getCreateOrderDto(createOrderVo);
         ArrayList<CreateOrderAccountRequest> orderAccountDtos = new ArrayList<>();
         long deliveryAmount = 0;
@@ -205,6 +204,9 @@ public class OrderAdapter {
             discountDeliveryAmount = shoppingCartGoodsDto.getDeliveryAmount() == null ? 0 : shoppingCartGoodsDto.getDeliveryAmount();
         }
         Long packageAmount = shoppingCartGoodsDto.getPackageAmount() == null ? 0L : shoppingCartGoodsDto.getPackageAmount();
+        Long totalScore = shoppingCartGoodsDto.getTotalScore() == null ? 0L : shoppingCartGoodsDto.getTotalScore();
+        createOrderDto.setTotalScore(totalScore);
+
         AppLogUtil.infoLog("fisherman 计算discountDeliveryAmount 的操作 end", deliveryAmount, discountDeliveryAmount);
         //商城实付无需加上配送费用和包装费
         if (createOrderVo.getMenuType().equals(BusinessTypeEnum.SAAS_MALL.getCode())) {

order-application-service/src/main/java/cn/freemud/service/business/OrderBusinessService.java

@@ -2,6 +2,8 @@ package cn.freemud.service.business;
 
 import com.freemud.application.sdk.api.ordercenter.request.PaySuccessReq;
 import com.freemud.sdk.api.assortment.order.request.order.ConfirmOrderRequest;
+import com.freemud.sdk.api.assortment.order.request.order.CreateOrderRequest;
+import com.freemud.sdk.api.assortment.order.response.order.CreateOrderResponse;
 import com.freemud.sdk.api.assortment.order.response.order.PayAccessResponse;
 
 /**
@@ -14,4 +16,8 @@ public interface OrderBusinessService {
     PayAccessResponse payAccess(ConfirmOrderRequest confirmOrderRequest);
 
     Integer getPaySuccessTimeout(ConfirmOrderRequest confirmOrderRequest, PaySuccessReq request);
+
+
+    CreateOrderResponse createOrderFlow(CreateOrderRequest createOrderRequest);
+
 }

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

@@ -287,7 +287,7 @@ public class MallOrderServiceImpl implements MallOrderService {
             createOrderRequest.setMqMessageRequest(mqMessageRequest);
             createOrderRequest.getBaseCreateOrderRequest().setUserName(userLoginInfoDto.getNickName());
             createOrderRequest.setTrackingNo(LogThreadLocal.getTrackingNo());
-            return orderCenterSdkService.createOrderFlow(createOrderRequest);
+            return orderBusinessService.createOrderFlow(createOrderRequest);
         });
 
         //普通订单

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

@@ -2752,7 +2752,7 @@ public class OrderServiceImpl implements Orderservice {
         createOrderRequest.setMqMessageRequest(mqMessageRequest);
         createOrderRequest.setTrackingNo(LogThreadLocal.getTrackingNo());
 //        AppLogUtil.debugLog("createOrder  sessionId:{},createOrderVo:{}", createOrderVo.getSessionId(), JSON.toJSONString(createOrderRequest));
-        return orderCenterSdkService.createOrderFlow(createOrderRequest);
+        return orderBusinessService.createOrderFlow(createOrderRequest);
     }
 
     /**
@@ -3271,7 +3271,7 @@ public class OrderServiceImpl implements Orderservice {
             createOrderRequest.setMqMessageRequest(mqMessageRequest);
             createOrderRequest.setOpenId(openId);
             createOrderRequest.setTrackingNo(LogThreadLocal.getTrackingNo());
-            return orderCenterSdkService.createOrderFlow(createOrderRequest);
+            return orderBusinessService.createOrderFlow(createOrderRequest);
         });
         //创建父子订单
         Function<Object, CreateFatherSonOrderResponse> createFatherSonOrder = (var -> {