订单聚合服务添加拼单加购人信息字段

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java

@@ -798,6 +798,11 @@ public class OrderSdkAdapter {
         productBean.setProductType(orderItemResp.getProductType());
         productBean.setId(orderItemResp.getId());
 
+        // 拼单类型商品加购人相关信息
+        productBean.setUserId(orderItemResp.getUserId());
+        productBean.setNickName(orderItemResp.getNickName());
+        productBean.setPhotoUrl(orderItemResp.getPhotoUrl());
+
         List<QueryOrdersResponse.DataBean.OrderBean.ProductBean.ProductDiscount> discountList = new ArrayList<QueryOrdersResponse.DataBean.OrderBean.ProductBean.ProductDiscount>();
         List<OrderSettlementResp> orderSettlementResps1 = orderSettlementResps == null ? new ArrayList<>() : orderSettlementResps;
         for (OrderSettlementResp orderSettlementResp : orderSettlementResps1) {

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/response/order/QueryOrdersResponse.java

@@ -517,6 +517,21 @@ public class QueryOrdersResponse {
                 private Long id;
 
                 /**
+                 * 加购人ID
+                 */
+                private String userId;
+
+                /**
+                 * 加购人昵称
+                 */
+                private String nickName;
+
+                /**
+                 * 加购人头像
+                 */
+                private String photoUrl;
+
+                /**
                  * 套餐子商品
                  */
                 public List<ProductBean> comboProduct;

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

+package cn.freemud.controller;
+
+import cn.freemud.base.entity.BaseResponse;
+import cn.freemud.entities.vo.CreateOrderVo;
+import cn.freemud.service.impl.CollageOrderServiceImpl;
+import com.freemud.application.sdk.api.log.ApiAnnotation;
+import com.freemud.application.sdk.api.log.LogParams;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+
+/**
+ * All rights Reserved, Designed By www.freemud.cn
+ *
+ * @version V1.0
+ * @Title: CreateOrderController
+ * @Package cn.freemud.controller
+ * @Description:
+ * @author: ping1.wu
+ * @date: 2020/5/21 17:16
+ * @Copyright: 2020 www.freemud.cn Inc. All rights reserved.
+ * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
+ */
+@Slf4j
+@RequestMapping("/order")
+@RestController
+@Validated
+public class CollageOrderController {
+
+    @Autowired
+    private CollageOrderServiceImpl collageOrderService;
+
+    @ApiOperation(value = "拼单订单提交", notes = "拼单订单提交")
+    @ApiImplicitParam(value = "请求", required = true, dataType = "CreateOrderVo", name = "CreateOrderVo")
+    @ApiAnnotation(logMessage = "collageOrderCreate")
+    @PostMapping(value = "/collage/create")
+    public BaseResponse collageOrderCreate(@Validated @LogParams @RequestBody CreateOrderVo requestVo) {
+        return collageOrderService.create(requestVo);
+    }
+
+}

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

+package cn.freemud.service;
+
+import cn.freemud.base.entity.BaseResponse;
+import cn.freemud.entities.vo.CreateOrderVo;
+
+/**
+ * All rights Reserved, Designed By www.freemud.cn
+ *
+ * @version V1.0.0
+ * @Description:
+ * @author: hui.miao
+ * @date: 2020-10-10 19:41
+ * @Copyright: 2020 www.freemud.cn Inc. All rights reserved.
+ * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
+ */
+public interface CollageOrderService {
+    /**
+     * 创建订单
+     */
+    BaseResponse create(CreateOrderVo createOrderVo);
+}

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

+/**
+ * All rights Reserved, Designed By www.freemud.cn
+ *
+ * @Title: CollageOrderServiceImpl
+ * @Package cn.freemud.service.impl
+ * @Description:
+ * @author: hui.miao
+ * @date: 2020/10/11 20:55
+ * @version V1.0
+ * @Copyright: 2020 www.freemud.cn Inc. All rights reserved.
+ * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
+ */
+package cn.freemud.service.impl;
+
+
+import cn.freemud.adapter.OrderAdapter;
+import cn.freemud.base.entity.BaseResponse;
+import cn.freemud.entities.dto.order.CreateOrderOperateDto;
+import cn.freemud.entities.dto.order.CreatePrepayRequestDto;
+import cn.freemud.entities.dto.shoppingCart.ShoppingCartGoodsDto;
+import cn.freemud.entities.vo.CreateOrderVo;
+import cn.freemud.enums.ResponseResult;
+import cn.freemud.service.CollageOrderService;
+import com.freemud.api.assortment.datamanager.entity.vo.AssortmentCustomerInfoVo;
+import com.freemud.application.sdk.api.log.LogThreadLocal;
+import com.freemud.application.sdk.api.ordercenter.request.OrderExtInfoDto;
+import com.freemud.application.sdk.api.storecenter.response.StoreResponse;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+@Slf4j
+public class CollageOrderServiceImpl implements CollageOrderService {
+    @Autowired
+    private OrderServiceImpl orderService;
+    @Autowired
+    private CheckOrder checkOrder;
+    @Autowired
+    private OrderAdapter orderAdapter;
+
+    @Override
+    public BaseResponse create(CreateOrderVo createOrderVo) {
+        String trackingNo = LogThreadLocal.getTrackingNo();
+        // 查询用户信息、校验svc卡,余额购物车校验
+        AssortmentCustomerInfoVo userLoginInfoDto = checkOrder.checkOrderByMember(createOrderVo, trackingNo);
+        // 查询门店信息 营业时间、营业状态，服务器当前时间在营业时间内 点餐桌号
+        StoreResponse.BizVO storeResponseDto = checkOrder.checkOrderByStore(createOrderVo, trackingNo);
+
+        // TODO 此处查询拼单订单购物车 返回类型转换为普通购物车Dto
+        ShoppingCartGoodsDto shoppingCartGoodsDto = checkOrder.getShoppingCartGoodsDto(createOrderVo);
+
+        // 查询小程序自提外卖配置信息 校验当前订单类型的下单参数 校验外卖是否满足起送条件
+        Integer pushOrderTime = checkOrder.checkOrderByOrderType(createOrderVo, userLoginInfoDto, storeResponseDto, shoppingCartGoodsDto, trackingNo);
+
+        OrderExtInfoDto extInfo = orderService.getExtInfo(userLoginInfoDto, storeResponseDto, pushOrderTime, createOrderVo);
+        //1.9.2套餐需求同步优化创建订单代码
+        BaseResponse createOrderOperateDtoResponse = orderService.sdkCreateOrder(createOrderVo, storeResponseDto, shoppingCartGoodsDto, userLoginInfoDto);
+        if(createOrderOperateDtoResponse == null || !ResponseResult.SUCCESS.getCode().equals(createOrderOperateDtoResponse.getCode()) || createOrderOperateDtoResponse.getResult() == null ) {
+            return createOrderOperateDtoResponse;
+        }
+        CreateOrderOperateDto createOrderOperateDto = (CreateOrderOperateDto)createOrderOperateDtoResponse.getResult();
+        //创建支付
+        CreatePrepayRequestDto createPrepayRequestDto = orderAdapter.convertToCreatePrepayRequestDto(userLoginInfoDto, createOrderVo, createOrderOperateDto, extInfo);
+        return orderService.createPrepayOrder(createPrepayRequestDto);
+    }
+}

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/response/orderInfo/OrderItemResp.java

@@ -106,4 +106,13 @@ public class OrderItemResp {
     //商品明细扩展对象
     private String extInfo;
 
+    //加购人ID
+    private String userId;
+
+    //加购人昵称
+    private String nickName;
+
+    //加购人头像
+    private String photoUrl;
+
 }