提交修改文件

order-application-service/src/main/java/cn/freemud/enums/ResponseResult.java

@@ -145,7 +145,7 @@ public enum ResponseResult {
     ORDER_OWNER_ERROR("45059","订单归属错误"),
     ORDER_STATUS_PRE_PAYMENT_NOT_SUPPORT("45060", "订单非待支付状态, 创建预支付失败"),
     ORDER_TAKEMEALTIME_INVALID("45061", "你的隔日预约时间有误，请重新刷新后选择！"),
-
+    ORDER_CONVERT_ERROR("45062", "查询订单结果转换失败"),
     /**
      * 支付
      */

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

@@ -103,4 +103,17 @@ public interface Orderservice {
     BaseResponse getRefundReason(GetRefundReasonVo getRefundReasonVo);
 
     BaseResponse getNewRefundReason(GetRefundReasonVo getRefundReasonVo);
+
+    /**
+     * 创建积分订单
+     * @param vo
+     * @return
+     */
+    BaseResponse createIntegralOrder(IntegralOrderVo vo);
+     /**
+      * @用户积分订单列表
+     * @param queryOrderByConditionsRequestVo
+     * @return
+     */
+    BaseResponse queryOrderByConditions(QueryOrderByConditionsRequestVo queryOrderByConditionsRequestVo);
 }

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

@@ -1348,6 +1348,31 @@ public class OrderServiceImpl implements Orderservice {
         return ResponseUtil.success(result);
     }
 
+    @Override
+    public BaseResponse createIntegralOrder(IntegralOrderVo vo) {
+        AssortmentCustomerInfoVo userInfo = customerInfoManager.getCustomerInfoByObject(vo.getSessionId());
+        if (userInfo == null || StringUtils.isEmpty(userInfo.getMemberId())) {
+            return ResponseUtil.error(ResponseResult.NOT_LOGIN);
+        }
+        ParkingOrderCreateReq req = new ParkingOrderCreateReq();
+        req.setBizType(vo.getBizType());
+        req.setUserId(userInfo.getMemberId());
+        req.setUserName(userInfo.getNickName());
+        req.setPartnerId(vo.getPartnerId());
+        req.setImgUlr(vo.getImgUrl());
+        req.setMobile(userInfo.getMobile());
+        //积分订单为4
+        req.setOrderType((byte) 4);
+        com.freemud.application.sdk.api.ordercenter.response.BaseResponse<OrderResp> result = orderSdkService.parking_v2_create(req, LogThreadLocal.getTrackingNo());
+        if (Objects.isNull(result)) {
+            return new BaseResponse(ResponseResultEnum.SYSTEM_ERROR.getCode(), ResponseResultEnum.SYSTEM_ERROR.getMessage(), "", null);
+        }
+        if (!ResponseResultEnum.SUCCESS.getCode().equalsIgnoreCase(result.getCode()) || Objects.isNull(result.getResult())) {
+            return new BaseResponse(result.getCode(), result.getMessage(), "", null);
+        }
+        return ResponseUtil.success();
+    }
+
     private String buildRefundDocument(String oid) {
         QueryOrderByIdResponseDto response = getQueryOrderByIdResponseDto(oid);
         if (!RESPONSE_SUCCESS_CODE.equals(response.getErrcode()) || response.getData() == null) {
@@ -2360,4 +2385,60 @@ public class OrderServiceImpl implements Orderservice {
         return channelType;
     }
 
+    public BaseResponse queryOrderByConditions(QueryOrderByConditionsRequestVo queryOrderByConditionsRequestVo){
+        AssortmentCustomerInfoVo userLoginInfoDto = customerInfoManager.getCustomerInfoByObject(queryOrderByConditionsRequestVo.getSessionId());
+        if (userLoginInfoDto == null || StringUtils.isBlank(userLoginInfoDto.getMemberId())) {
+            return ResponseUtil.error(ResponseResult.NOT_LOGIN);
+        }
+        String userId = userLoginInfoDto.getMemberId();
+        List<QueryOrderByConditionsResponseVo> responseVos = null;
+        try {
+            OrderConditionsReq orderConditionsReq = new OrderConditionsReq();
+            BeanUtil.convertBean(queryOrderByConditionsRequestVo, orderConditionsReq);
+            orderConditionsReq.setUserId(userId);
+            Date startDate = DateUtil.convert2Date("2020-08-01 00:00:00", DateUtil.FORMAT_YYYY_MM_DD_HHMMSS);
+            orderConditionsReq.setStartTimestamp(startDate.getTime()/1000);
+            orderConditionsReq.setEndTimestamp(new Date().getTime()/1000);
+            BaseDownLoadResponse<List<OrderInfoReqs>> orderInfoReqs = orderDownLoadSdkService.queryOrderByConditions(orderConditionsReq,LogTreadLocal.getTrackingNo());
+            if (!String.valueOf(RESPONSE_SUCCESS_CODE).equals(orderInfoReqs.getCode())) {
+                return ResponseUtil.error(ResponseResult.ORDER_QUERYORDER_ERROR.getCode());
+            }
+            Map<String, Object> responseMap = Maps.newTreeMap();
+            //用户无订单数据
+            if (orderInfoReqs.getResult() == null || orderInfoReqs.getTotalNum()== 0) {
+                return ResponseUtil.success();
+            }
+            responseVos = orderInfoReqs.getResult().stream().map(
+            orderBean -> {
+                QueryOrderByConditionsResponseVo queryOrderByConditionsResponseVo = new QueryOrderByConditionsResponseVo();
+                BeanUtil.convertBean(orderBean,queryOrderByConditionsResponseVo);
+                BeanUtil.convertBean(orderBean,queryOrderByConditionsResponseVo);
+                List<String> imgUrl = new ArrayList<>();
+                String extInfo = orderBean.getExtInfo();
+                if(!StringUtil.isEmpty(extInfo)){
+                    JSONObject jsonObject = JSONObject.parseObject(extInfo);
+                    JSONArray jsonArray = (JSONArray) JSONArray.parse(jsonObject.getString("imgUlr"));
+                    for(int i = 0 ;i< jsonArray.size() ;i++){
+                        imgUrl.add(String.valueOf(jsonArray.get(i)));
+                    }
+                }
+                if(null !=orderBean.getOrderSettlementDetailList() && orderBean.getOrderSettlementDetailList().size()>0){
+                    queryOrderByConditionsResponseVo.setSettlementAmount(orderBean.getOrderSettlementDetailList().stream().map(OrderSettlementResp::getSettlementAmount).reduce(BigDecimal.ZERO,BigDecimal::add));
+                }else{
+                    queryOrderByConditionsResponseVo.setSettlementAmount(BigDecimal.ZERO);
+                }
+                queryOrderByConditionsResponseVo.setImgUrl(imgUrl);
+                queryOrderByConditionsResponseVo.setOrderStateValue(orderSdkAdapter.getOrderStatusValue(orderBean.getOrderState()));
+                SimpleDateFormat sdff=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+                String sd = sdff.format(new Date(Long.valueOf(orderBean.getCreateTime())));
+                queryOrderByConditionsResponseVo.setCreateTime(sd);
+                return queryOrderByConditionsResponseVo;                }
+            ).collect(Collectors.toList());
+        } catch (Exception e) {
+            LogUtil.error("queryOrders_error", gson.toJson(queryOrderByConditionsRequestVo), e);
+            return ResponseUtil.error(ResponseResult.ORDER_QUERYORDER_ERROR);
+        }
+        return ResponseUtil.success(responseVos);
+    }
+
 }

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/constant/InterfaceAddressConstant.java

@@ -188,4 +188,24 @@ public class InterfaceAddressConstant {
      * 停车场订单，根据综合条件查询订单(单次查询默认返回500条（建议pageSize不要大于1000），返回的scrollId 有效时间为120秒)
      */
     public static final String QUERY_PARKING_ORDER_BY_CONDITIONS = "parking/v2/queryOrderByConditions";
+
+
+    /**
+     * 停车场 创建订单
+     */
+    public static final String PARKING_V2_CREATE = "/parking/v2/create";
+
+    /**
+     * /parking/v2/affirm
+     * 完成停车订单
+     */
+    public static final String PARKING_V2_AFFIRM = "/parking/v2/affirm";
+
+    /**
+     * /parking/v2/cancel
+     * 审核不通过
+     */
+    public static final String PARKING_V2_CANCEL = "/parking/v2/cancel";
+
+
 }

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/service/OrderSdkService.java

@@ -753,4 +753,38 @@ public class OrderSdkService {
         return responseHandle(responseDTO);
     }
 
+
+    /**
+     * 停车场 创建订单
+     */
+    public BaseResponse parking_v2_create(ParkingOrderCreateReq request, String trackingNo) {
+        OrderBaseResp<OrderResp> responseDTO = RequestThirdPartyUtils.httpJsonReqComplexNew(restTemplate, PARKING_V2_CREATE,
+                createBaseRequest(request, trackingNo), new ParameterizedTypeReference<OrderBaseResp<OrderResp>>() {
+                });
+        return responseHandle(responseDTO);
+    }
+
+
+    /**
+     * /parking/v2/affirm
+     * 完成停车订单
+     */
+    public BaseResponse parking_v2_affirm(ParkingOrderAffirmReq request, String trackingNo) {
+        OrderBaseResp<OrderResp> responseDTO = RequestThirdPartyUtils.httpJsonReqComplexNew(restTemplate, PARKING_V2_AFFIRM,
+                createBaseRequest(request, trackingNo), new ParameterizedTypeReference<OrderBaseResp<OrderResp>>() {
+                });
+        return responseHandle(responseDTO);
+    }
+
+    /**
+     * /parking/v2/cancel
+     * 审核不通过
+     */
+    public BaseResponse parking_v2_cancel(ParkingOrderCancelReq request, String trackingNo) {
+        OrderBaseResp<OrderResp> responseDTO = RequestThirdPartyUtils.httpJsonReqComplexNew(restTemplate, PARKING_V2_CANCEL,
+                createBaseRequest(request, trackingNo), new ParameterizedTypeReference<OrderBaseResp<OrderResp>>() {
+                });
+        return responseHandle(responseDTO);
+    }
+
 }

shopping-cart-application-service/src/main/java/cn/freemud/controller/ShoppingCartController.java

@@ -18,9 +18,11 @@ import cn.freemud.enums.CreateOrderType;
 import cn.freemud.enums.OrderChannelType;
 import cn.freemud.enums.ResponseResult;
 import cn.freemud.service.ShoppingCartNewService;
+import cn.freemud.service.ShoppingCartToolsService;
 import cn.freemud.service.impl.ShoppingCartMallServiceImpl;
 import cn.freemud.service.impl.ShoppingCartMealServiceImpl;
 import cn.freemud.service.impl.ShoppingCartNewServiceImpl;
+import cn.freemud.service.impl.ShoppingCartToolsServiceImpl;
 import cn.freemud.utils.ResponseUtil;
 import com.freemud.api.assortment.datamanager.entity.vo.AssortmentCustomerInfoVo;
 import com.freemud.api.assortment.datamanager.enums.IappIdType;
@@ -166,4 +168,13 @@ public class ShoppingCartController {
         return SDKCommonBaseContextWare.getBean(ShoppingCartNewServiceImpl.class);
     }
 
+    /**
+     * 清空购物车{技术支持用}
+     */
+    @ApiAnnotation(logMessage = "clear/goods")
+    @PostMapping(value = "/clearGoods")
+    public BaseResponse clearGoods(@Validated @LogParams @RequestBody ShoppingCartClearToolsRequestVo request) {
+        return SDKCommonBaseContextWare.getBean(ShoppingCartToolsServiceImpl.class).clear(request);
+    }
+
 }