Merge branch 'feature/20201208_collageOrder_miaohui' into 'qa'

拼单状态补充

See merge request !68

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

@@ -80,7 +80,7 @@ public class CollageOrderServiceImpl implements CollageOrderService {
         collageOrderDto.setShopId(createOrderVo.getShopId());
         collageOrderDto.setCreateCollageUserId(createOrderVo.getUserId());
         BaseResponse<Integer> collageOrderResponse = shoppingCartClient.getCollageOrderStatus(collageOrderDto);
-        if (null == collageOrderResponse || null == collageOrderResponse.getResult()) {
+        if (null == collageOrderResponse || null == collageOrderResponse.getResult() || -1 == collageOrderResponse.getResult()) {
             return ResponseUtil.error(ResponseResult.COLLAGE_ORDER_CREATE_ERROR_NOT_EXIST);
         } else if (1 == collageOrderResponse.getResult()) {
             return ResponseUtil.error(ResponseResult.COLLAGE_ORDER_CREATE_ERROR_PAYED);

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

@@ -103,6 +103,7 @@ public class CollageOrderServiceImpl implements CollageOrderService {
     @Override
     public BaseResponse queryCollageOrderStatus(CollageOrderRequestVo request) {
         CollageOrderDto collageOrderDto = this.collageOrderAdapter.convert2CollageOrderDto(request);
+        collageOrderDto.setCreateCollageUserId(this.getUserIdBySessionId(request.getSessionId()));
         BaseResponse<CollageOrder> queryCollageOrderResponse = this.collageOrderBaseService.queryCollageOrder(collageOrderDto);
         CollageOrder collageOrder = queryCollageOrderResponse.getResult();
         return ResponseUtil.success(null == collageOrder ? -1 : collageOrder.getStatus());