Merge remote-tracking branch 'origin/master'

assortment-ordercenter-sdk/pom.xml

@@ -10,7 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>assortment-ordercenter-sdk</artifactId>
-    <version>1.5.12-RELEASE</version>
+    <version>1.5.14-RELEASE</version>
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -38,7 +38,7 @@
         <dependency>
             <groupId>cn.freemud</groupId>
             <artifactId>ordercenter-sdk</artifactId>
-            <version>1.3.5.RELEASE</version>
+            <version>1.3.7.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>

assortment-ordercenter-sdk/readme.md

@@ -63,4 +63,6 @@
 | 1.5.10.RELEASE | 买券订单修改升级RELEASE | wuping | 2020-06-10 |
 | 1.9.2-SNAPSHOT| 预约单任务删除  | wuping | 2020-06-05 |
 | 1.5.11.RELEASE | 预约单任务删除RELEASE | wuping | 2020-06-15 |
-| 1.5.12.RELEASE | 围餐 | dingkai | 2020-06-16 |
\ No newline at end of file
+| 1.5.12.RELEASE | 围餐 | dingkai | 2020-06-16 |
+| 1.5.13.RELEASE | 小助手营业额统计 | 梁崇福 | 2020-06-22 |
+| 1.5.14.RELEASE | 停车费sdk | dingkai | 2020-06-22 |
\ No newline at end of file

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

@@ -1324,6 +1324,9 @@ public class OrderSdkAdapter {
             case "fmwd":
                 orderClientType = 25;
                 break;
+            case "parking":
+                orderClientType = 99;
+                break;
             default:
                 orderClientType = OrderClientType.SAAS.getIndex();
                 break;
@@ -1373,6 +1376,9 @@ public class OrderSdkAdapter {
             case 25:
                 name = "fmwd";
                 break;
+            case 99:
+                name = "parking";
+                break;
             default:
                 name = orderClientType.toString();
                 break;
@@ -1420,6 +1426,9 @@ public class OrderSdkAdapter {
             case 25:
                 name = "非码微店";
                 break;
+            case 99:
+                name = "农工商停车";
+                break;
             default:
                 break;
         }

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/enums/OrderSourceType.java

@@ -39,6 +39,8 @@ public enum OrderSourceType {
     SAASMALL("saasmall", "微商城"),
 
     APP("app", "APP"),
+
+    PARKING("parking", "农工商停车"),
     ;
 
     private String code;

call-back-service/src/main/java/cn/freemud/amp/service/OrderCallBackMQService.java

@@ -37,6 +37,7 @@ import com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderItemR
 import com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderSettlementResp;
 import com.freemud.sdk.api.assortment.orderdistributor.request.DisRequest;
 import com.freemud.sdk.api.assortment.orderdistributor.service.OrderDistributionService;
+import com.google.common.collect.Lists;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.ObjectUtils;
 import org.apache.commons.lang.StringUtils;
@@ -141,7 +142,8 @@ public class OrderCallBackMQService {
         }
         try {
             OrderInfoReqs orderInfoReqs = JSONObject.parseObject(body.getContent(), OrderInfoReqs.class);
-            if (orderInfoReqs != null && OrderClientType.SAAS.getIndex().equals(orderInfoReqs.getOrderClient()) &&
+            List<Integer> allowOrderClientList = Lists.newArrayList(OrderClientType.SAAS.getIndex(), OrderClientType.ALIPAY.getIndex());
+            if (orderInfoReqs != null && allowOrderClientList.contains(orderInfoReqs.getOrderClient()) &&
                     ((body.getOperateType() == 0 && NewOrderStatus.PENDING_PAYMENT.getIndex().equals(orderInfoReqs.getOrderState())) ||
                             (body.getOperateType() == 1 && NewOrderStatus.PLACE_AN_ORDER.getIndex().equals(orderInfoReqs.getOrderState())))) {
                 return orderInfoReqs;
@@ -218,6 +220,7 @@ public class OrderCallBackMQService {
             dishInfo.setCount(item.getProductQuantity());
             dishInfo.setName(item.getProductName());
             dishInfo.setPrice(item.getProductPrice().intValue());
+            dishInfo.setUrl(item.getProductPicUrl());
             dishList.add(dishInfo);
         }
         wechatReportOrderDto.setDishList(dishList);

call-back-service/src/main/java/cn/freemud/entities/dto/WechatReportOrderDto.java

@@ -115,6 +115,10 @@ public class WechatReportOrderDto {
          * 菜品数量
          */
         private float count;
+        /**
+         * 图片
+         */
+        private String url;
     }
 
     @Data

order-management/src/main/java/cn/freemud/management/service/adapter/OrderManagerAdapter.java

@@ -43,7 +43,8 @@ public class OrderManagerAdapter {
         if (ObjectUtils.notEqual(verifyResponse.getCode(), ResponseResult.SUCCESS.getCode())) {
             return verifyResponse;
         }
-        return orderBeanFactory.getOrderManagerService(orderBean).orderConfirm(request, orderBean);
+        BaseResponse<OrderManagerResponse> orderManagerResponse = orderBeanFactory.getOrderManagerService(orderBean).orderConfirm(request, orderBean);
+        return handleResponse(request,orderBean,orderManagerResponse);
     }
 
     /**

order-management/src/main/java/cn/freemud/management/service/handle/DeliveryHandle.java

@@ -61,13 +61,13 @@ public class DeliveryHandle {
     /**
      * 创建配送单
      *
-     * @param data
+     * @param orderBean
      * @param request
      * @return
      */
     public BaseResponse createDelivery(QueryOrdersResponse.DataBean.OrderBean orderBean, OrderManagerRequest request, StoreResponse storeInfo) {
         if (storeInfo == null || ObjectUtils.notEqual(ResponseResult.SUCCESS.getCode(), storeInfo.getStatusCode().toString()) || storeInfo.getBizVO() == null) {
-            throw new OrderServiceException(ResponseResult.STORE_INFO_NOT_FOUND);
+            return ResponseUtil.error(ResponseResult.STORE_INFO_NOT_FOUND);
         }
         if (!checkOrderOfDelivery(orderBean)) {
             return ResponseUtil.success();
@@ -91,7 +91,7 @@ public class DeliveryHandle {
     /**
      * 取消配送
      *
-     * @param orderBean
+     * @param data
      * @param request
      * @return
      */
@@ -106,7 +106,7 @@ public class DeliveryHandle {
             }
             //运单状态非待接单或系统接单时，不能取消运单
             if (ObjectUtils.equals(DeliveryStatus.RIDERSTARTDELIVERY.getCode(), deliverStatus)) {
-                throw new DeliveryServiceException(ResponseResult.DELIVERY_CANCEL_ORDER_ERROR, String.format("订单已%s，不能取消", DeliveryStatus.getDescByCode(data.getAddInfo().getDeliverStatus())));
+                return ResponseUtil.error(ResponseResult.DELIVERY_CANCEL_ORDER_ERROR);
             }
             CancelDeliveryOrderRequestDto cancelDeliveryOrderRequestDto = new CancelDeliveryOrderRequestDto();
             cancelDeliveryOrderRequestDto.setDeliveryId(data.getAddInfo().getDeliveryId());
@@ -115,7 +115,7 @@ public class DeliveryHandle {
             cancelDeliveryOrderRequestDto.setOrderCancelDescription("顾客取消订单");
             DeliveryResponseDto deliveryResponse = deliveryService.deliveryOrderCancel(cancelDeliveryOrderRequestDto, LogThreadLocal.getTrackingNo());
             if (deliveryResponse == null || !StringUtils.equals(ResponseResult.SUCCESS.getCode(), deliveryResponse.getCode()+"")) {
-                throw new DeliveryServiceException(ResponseResult.DELIVERY_CANCEL_ORDER_ERROR, deliveryResponse.getMsg());
+                return ResponseUtil.error(ResponseResult.DELIVERY_CANCEL_ORDER_ERROR);
             }
         }
         return ResponseUtil.success();

order-management/src/main/java/cn/freemud/management/service/handle/SaasOrderHandle.java

@@ -54,7 +54,7 @@ public class SaasOrderHandle {
             return ResponseUtil.success();
         }
         if (ObjectUtils.notEqual(ResponseResult.SUCCESS.getCode(), confirmOrderResponse.getErrcode().toString())) {
-            throw new OrderServiceException(ResponseResult.ORDER_ACCEPT_FAILED);
+            return ResponseUtil.error(ResponseResult.ORDER_ACCEPT_FAILED);
         }
         return ResponseUtil.success();
     }
@@ -70,7 +70,7 @@ public class SaasOrderHandle {
         BaseQueryOrderRequest orderDoneRequest = orderSdkAdapter.getOrderConfirmRequest(request.getOperator(), orderBean);
         BaseOrderResponse baseOrderResponse = orderCenterSdkService.orderDone(orderDoneRequest);
         if (baseOrderResponse == null || ObjectUtils.notEqual(ResponseResult.SUCCESS.getCode(), baseOrderResponse.getErrcode().toString())) {
-            throw new OrderServiceException(ResponseResult.DONE_ORDER_FAIL);
+            return ResponseUtil.error(ResponseResult.DONE_ORDER_FAIL);
         }
         return ResponseUtil.success();
     }
@@ -86,7 +86,7 @@ public class SaasOrderHandle {
         BaseQueryOrderRequest orderDeliveryRequest = orderSdkAdapter.getOrderConfirmRequest(request.getOperator(), orderBean);
         BaseOrderResponse baseOrderResponse = orderCenterSdkService.orderSend(orderDeliveryRequest);
         if (baseOrderResponse == null || ObjectUtils.notEqual(ResponseResult.SUCCESS.getCode(), baseOrderResponse.getErrcode().toString())) {
-            throw new OrderServiceException(ResponseResult.DELIVERY_FAIL);
+            return ResponseUtil.error(ResponseResult.DELIVERY_FAIL);
         }
         return ResponseUtil.success();
     }
@@ -102,7 +102,7 @@ public class SaasOrderHandle {
         BaseQueryOrderRequest orderAffirmRequest = orderSdkAdapter.getOrderConfirmRequest(request.getOperator(), orderBean);
         BaseOrderResponse baseOrderResponse = orderCenterSdkService.orderAffirm(orderAffirmRequest);
         if (baseOrderResponse == null || ObjectUtils.notEqual(ResponseResult.SUCCESS.getCode(), baseOrderResponse.getErrcode().toString())) {
-            throw new OrderServiceException(ResponseResult.AFFIRM_ORDER_FAIL);
+            return ResponseUtil.error(ResponseResult.AFFIRM_ORDER_FAIL);
         }
         return ResponseUtil.success();
     }
@@ -119,7 +119,7 @@ public class SaasOrderHandle {
         CancelOrderRequest cancelOrderRequest = orderSdkAdapter.getCancelOrderRequest(request.getOperator(), request.getReason(), refundResponse.getPayRefundStatus(), refundResponse.getRefundId(), orderBean);
         BaseOrderResponse baseOrderResponse = orderCenterSdkService.orderReject(cancelOrderRequest);
         if (baseOrderResponse == null || ObjectUtils.notEqual(ResponseResult.SUCCESS.getCode(), baseOrderResponse.getErrcode().toString())) {
-            throw new OrderServiceException(ResponseResult.AFFIRM_ORDER_FAIL);
+            return ResponseUtil.error(ResponseResult.AFFIRM_ORDER_FAIL);
         }
         return ResponseUtil.success();
     }
@@ -141,7 +141,7 @@ public class SaasOrderHandle {
             baseOrderResponse = orderCenterSdkService.refundReturn(refundAgreeRequest);
         }
         if (baseOrderResponse == null || ObjectUtils.notEqual(ResponseResult.SUCCESS.getCode(), baseOrderResponse.getErrcode().toString())) {
-            throw new OrderServiceException(ResponseResult.AGREE_REFUND_ORDER_FAIL);
+            return ResponseUtil.error(ResponseResult.AGREE_REFUND_ORDER_FAIL);
         }
         return ResponseUtil.success();
     }
@@ -156,7 +156,7 @@ public class SaasOrderHandle {
         CancelOrderRequest rejectRefundRequest = orderSdkAdapter.getRejectRefundRequest(request.getOperator(), request.getReason(), orderBean);
         BaseOrderResponse baseOrderResponse = orderCenterSdkService.orderRefundReject(rejectRefundRequest);
         if (baseOrderResponse == null || ObjectUtils.notEqual(ResponseResult.SUCCESS.getCode(), baseOrderResponse.getErrcode().toString())) {
-            throw new OrderServiceException(ResponseResult.REJECT_REFUND_ORDER_FAIL);
+            return ResponseUtil.error(ResponseResult.REJECT_REFUND_ORDER_FAIL);
         }
         return ResponseUtil.success();
 

order-management/src/main/java/cn/freemud/management/service/impl/SaasOrderMangerServiceImpl.java

@@ -7,6 +7,7 @@ import cn.freemud.management.entities.dto.response.pay.PayRefundResponse;
 import cn.freemud.management.enums.OperateType;
 import cn.freemud.management.enums.RefundStatus;
 import cn.freemud.management.enums.ResponseResult;
+import cn.freemud.management.intercept.OrderServiceException;
 import cn.freemud.management.service.OrderBaseService;
 import cn.freemud.management.service.OrderManagerService;
 import cn.freemud.management.service.handle.DeliveryHandle;
@@ -131,7 +132,12 @@ public class SaasOrderMangerServiceImpl implements OrderManagerService {
     @Override
     public BaseResponse<OrderManagerResponse> orderReject(OrderManagerRequest request, QueryOrdersResponse.DataBean.OrderBean orderBean) {
         //支付退款
-        PayRefundResponse refundResponse = paymentHandle.refund(request, orderBean);
+        PayRefundResponse refundResponse = new PayRefundResponse();
+        try {
+            refundResponse = paymentHandle.refund(request, orderBean);
+        } catch (OrderServiceException orderEx){ // 爱马哥兼容，不抛错
+            return ResponseUtil.error(orderEx.getResult());
+        }
         //订单拒单
         saasOrderHandle.orderReject(request, refundResponse, orderBean);
         // 推送pos、微信消息中心
@@ -154,7 +160,12 @@ public class SaasOrderMangerServiceImpl implements OrderManagerService {
         //取消配送单
         deliveryHandle.cancelDelivery(orderBean,request);
         //支付退款
-        PayRefundResponse refundResponse = paymentHandle.refund(request, orderBean);
+        PayRefundResponse refundResponse = new PayRefundResponse();
+        try {
+            refundResponse = paymentHandle.refund(request, orderBean);
+        } catch (OrderServiceException orderEx){ // 爱马哥兼容，不抛错
+            return ResponseUtil.error(orderEx.getResult());
+        }
         //订单同意退款
         saasOrderHandle.refundAgree(request, refundResponse, orderBean);
         // 推送pos、微信消息中心

ordercenter-sdk/pom.xml

@@ -8,7 +8,7 @@
         <version>1.0.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-    <version>1.3.5.RELEASE</version>
+    <version>1.3.7.RELEASE</version>
     <artifactId>ordercenter-sdk</artifactId>
 
     <dependencies>

ordercenter-sdk/readme.md

@@ -37,4 +37,6 @@
 | 1.3.3.RELEASE | 买券订单修改升级RELEASE | wuping | 2020-06-10 |
 | 1.3.13-SNAPSHOT | 预约单任务删除 | wuping | 2020-06-05 |
 | 1.3.4.RELEASE | 预约单任务删除RELEASE | wuping | 2020-06-15 |
-| 1.3.5.RELEASE | 围餐 | dingkai | 2020-06-16 |
\ No newline at end of file
+| 1.3.5.RELEASE | 围餐 | dingkai | 2020-06-16 |
+| 1.3.6.RELEASE | 小助手营业额统计 | 梁崇福 | 2020-06-22 |
+| 1.3.7.RELEASE | 停车场sdk | dingkai | 2020-06-22 |
\ No newline at end of file

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

@@ -181,4 +181,7 @@ public class InterfaceAddressConstant {
      * 新增结算信息
      */
     public static final String CREATE_SETTLEMENT="order/v2/createSettlement";
+
+    //小助手营业额统计
+    public static final String QUERY_ORDER_STATISTICS = "order/v2/queryOrderStatistics";
 }

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/enums/OrderClientType.java

@@ -35,6 +35,7 @@ public enum OrderClientType {
     KOUBEI(22, "口碑"),
     SAASMALL(23, "微商城"),
     FMWD(25, "非码微店"),
+    PARKING(99 , "农工商停车"),
     ;
 
 

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/OrderExtInfoDto.java

@@ -14,6 +14,8 @@ package com.freemud.application.sdk.api.ordercenter.request;
 
 import lombok.Data;
 
+import java.util.Date;
+
 @Data
 public class OrderExtInfoDto {
 
@@ -119,4 +121,21 @@ public class OrderExtInfoDto {
      * 扫呗商户号 新支付服务做中转使用
      */
     private String terminalId;
+
+    /**
+     * 停车场ID
+     */
+    private String parkingAreaId;
+    /**
+     * 车牌号
+     */
+    private String carNumber;
+    /**
+     * 入场时间
+     */
+    private String inTime;
+    /**
+     * 出场时间
+     */
+    private String outTime;
 }

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

+package com.freemud.application.sdk.api.ordercenter.response.orderInfo;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class OrderStatisticsResp {
+
+    private Long todayOrderCount;
+
+    private BigDecimal todayTotalAmount;
+
+    private BigDecimal yesterdayTotalAmount;
+
+    private Long yesterdayOrderCount;
+
+    private BigDecimal todayEachOrderPrice;
+
+    private BigDecimal yesterdayEachOrderPrice;
+
+
+}

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

@@ -10,9 +10,11 @@ import com.freemud.application.sdk.api.ordercenter.request.QueryAfterSalesOrderC
 import com.freemud.application.sdk.api.ordercenter.request.QueryOrderByScrollRequest;
 import com.freemud.application.sdk.api.ordercenter.response.BaseDownLoadResponse;
 import com.freemud.application.sdk.api.ordercenter.response.AfterSalesListResp;
+import com.freemud.application.sdk.api.ordercenter.response.BaseResponse;
 import com.freemud.application.sdk.api.ordercenter.response.OrderItemStatisticsResponse;
 import com.freemud.application.sdk.api.ordercenter.response.orderInfo.AfterSalesOrderResp;
 import com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderInfoReqs;
+import com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderStatisticsResp;
 import com.freemud.application.sdk.api.ordercenter.response.orderInfo.QueryByCodeResponse;
 import com.freemud.application.sdk.api.util.RequestThirdPartyUtils;
 import lombok.extern.slf4j.Slf4j;
@@ -141,6 +143,16 @@ public class OrderDownLoadSdkService {
         return baseDownLoadResponse;
     }
 
+    /**
+     * 小助手营业额统计查询
+     */
+    public BaseResponse<OrderStatisticsResp> queryOrderStatistics(OrderConditionsReq request, String trackingNo) {
+        BaseResponse<OrderStatisticsResp> responseDTO = RequestThirdPartyUtils.httpJsonReqComplexDownLoad(restTemplate, InterfaceAddressConstant.QUERY_ORDER_STATISTICS,
+                createBaseRequest(request, trackingNo), new ParameterizedTypeReference<BaseResponse<OrderStatisticsResp>>() {
+                });
+        return responseDTO;
+    }
+
     private <T> BaseDownLoadResponse<T> responseHandle(BaseDownLoadResponse<T> responseDTO) {
         BaseDownLoadResponse baseDownLoadResponse = new BaseDownLoadResponse();
         if (responseDTO == null) {
@@ -171,4 +183,7 @@ public class OrderDownLoadSdkService {
         request.setTrackingNo(trackingNo);
         return request;
     }
+
+
+
 }