Merge remote-tracking branch 'origin/feature/beautiful-刘鹏飞'

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

@@ -42,6 +42,7 @@ public enum OrderSourceType {
     FMWD("fmwd", "非码微店", 25),
     Y_POS("ypos", "非码云POS", 26),
     TIKTOKPAY("tiktokpay","抖音支付", 27),
+    BEAUTIFUL("beautiful","美业", 28),
     parkingmanual("parkingmanual", "农工商停车手工录单", 98),
     PARKING("parking", "农工商停车", 99),
     SDG("sdg", "闪电购", 1000);

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

@@ -1622,7 +1622,7 @@ public class OrderAdapter {
             if (OrderStatus.TAKE_ORDER.getCode().equals(orderBean.getStatus())) {
                 if (refundBean == null || RefundStatus.REFUSE_REFUND.getCode().equals(refundBean.getStatus())) {
                     orderViewStatusDto.setOrderStatus(OrderStatus.TAKE_ORDER.getCode());
-                    orderViewStatusDto.setOrderStatusDesc("下单成功");
+                    orderViewStatusDto.setOrderStatusDesc(conventCreateOrderString(orderBean));
                     orderViewStatusDto.setOrderStatusDescText("目前有" + orderBean.getQueueIndex() + "人在排队，凭此页到店领取哦~");
                     if (StringUtils.isBlank(orderBean.getQueueIndex()) || "0".equals(orderBean.getQueueIndex())) {
                         orderViewStatusDto.setOrderStatusDescText("凭此页到店领取哦~");
@@ -1647,7 +1647,7 @@ public class OrderAdapter {
             if (OrderStatus.RECEIPT.getCode().equals(orderBean.getStatus())) {
                 if (refundBean == null || RefundStatus.REFUSE_REFUND.getCode().equals(refundBean.getStatus())) {
                     orderViewStatusDto.setOrderStatus(OrderStatus.RECEIPT.getCode());
-                    orderViewStatusDto.setOrderStatusDesc("制作中");
+                    orderViewStatusDto.setOrderStatusDesc(conventProduceString(orderBean));
                     orderViewStatusDto.setOrderStatusDescText("目前有" + orderBean.getQueueIndex() + "人在排队，凭此页到店领取哦~");
                     if (StringUtils.isBlank(orderBean.getQueueIndex()) || "0".equals(orderBean.getQueueIndex())) {
                         orderViewStatusDto.setOrderStatusDescText("凭此页到店领取哦~");
@@ -1698,7 +1698,7 @@ public class OrderAdapter {
                 if (refundBean == null || RefundStatus.REFUSE_REFUND.getCode().equals(refundBean.getStatus())) {
                     if (orderBean.getDeliverStatus() == null) {
                         orderViewStatusDto.setOrderStatus(OrderStatus.TAKE_ORDER.getCode());
-                        orderViewStatusDto.setOrderStatusDesc("下单成功");
+                        orderViewStatusDto.setOrderStatusDesc(conventProduceString(orderBean));
                         orderViewStatusDto.setOrderStatusDescText("请稍等片刻，美味即将到达哦~");
                         orderViewStatusDto.setButtonContactPartner(true);
                         orderViewStatusDto.setButtonRefund(checkRefundButton(orderBean,wxAppId));
@@ -1707,7 +1707,7 @@ public class OrderAdapter {
                         orderViewStatusDto.setRiderPhoto(orderBean.getRiderPhoto());
                     } else {
                         orderViewStatusDto.setOrderStatus(OrderStatus.TAKE_ORDER.getCode());
-                        orderViewStatusDto.setOrderStatusDesc("下单成功");
+                        orderViewStatusDto.setOrderStatusDesc(conventProduceString(orderBean));
                         orderViewStatusDto.setOrderStatusDescText("请稍等片刻，美味即将到达哦~");
                         orderViewStatusDto.setButtonContactPartner(true);
                         orderViewStatusDto.setButtonRefund(checkRefundButton(orderBean,wxAppId));
@@ -1728,7 +1728,7 @@ public class OrderAdapter {
                 if (refundBean == null || RefundStatus.REFUSE_REFUND.getCode().equals(refundBean.getStatus())) {
                     if (orderBean.getDeliverStatus() == null) {
                         orderViewStatusDto.setOrderStatus(OrderStatus.RECEIPT.getCode());
-                        orderViewStatusDto.setOrderStatusDesc("制作中");
+                        orderViewStatusDto.setOrderStatusDesc(conventProduceString(orderBean));
                         orderViewStatusDto.setOrderStatusDescText("请稍等片刻，美味即将到达哦~");
                         orderViewStatusDto.setRiderName("商家自配送");
                         orderViewStatusDto.setRiderText("正在为您匹配配送员");
@@ -1737,7 +1737,7 @@ public class OrderAdapter {
                         orderViewStatusDto.setButtonContactPartner(true);
                     } else {
                         orderViewStatusDto.setOrderStatus(OrderStatus.RECEIPT.getCode());
-                        orderViewStatusDto.setOrderStatusDesc("制作中");
+                        orderViewStatusDto.setOrderStatusDesc(conventProduceString(orderBean));
                         orderViewStatusDto.setOrderStatusDescText("请稍等片刻，美味即将到达哦~");
                         orderViewStatusDto.setRiderName(StringUtils.isEmpty(orderBean.getRiderName()) ? "处理中" : orderBean.getRiderName());
                         orderViewStatusDto.setRiderText(StringUtils.isEmpty(orderBean.getRiderName()) ? "正在为您匹配配送员" : "配送员");
@@ -3896,7 +3896,9 @@ public class OrderAdapter {
         } else if(OrderChannelType.APP.getCode().equals(channelType)){
             orderClients.add(OrderClientType.APP.getIndex());
             //queryOrdersDto.setSource(new String[]{"app"});
-        } else {
+        } else if(OrderChannelType.BEAUTIFUL.getCode().equals(channelType)){// 美业新加
+            orderClients.add(OrderClientType.BEAUTIFUL.getIndex());
+        }else {
             orderClients.add(OrderClientType.SAAS.getIndex());
             //queryOrdersDto.setSource(new String[]{"saas"});
         }
@@ -3936,6 +3938,9 @@ public class OrderAdapter {
                 //queryOrdersDto.setStatus(new Integer[]{OrderStatus.COMPLETE.getCode()});
             }
             if (QueryOrderStatus.REFUND_BILL.getCode().equals(queryOrderStatus)) {
+                // 目前只有美业在用
+                payStatus = Arrays.asList(PayStatus.HAVE_REFUND.getCode());
+                queryOrdersDto.setPayStatuses(payStatus);
                 //Integer[] statuses = new Integer[]{RefundStatus.APPLY_REFUND.getCode(), RefundStatus.AGREE_REFUND.getCode(), RefundStatus.COMPLETE_REFUND.getCode()};
                 //queryOrdersDto.setRefundStatus(statuses);
             }
@@ -3963,6 +3968,11 @@ public class OrderAdapter {
                 //queryOrdersDto.setPayStatus(new Integer[]{PayStatus.NOT_PAY.getCode()});
             }
 
+            if(QueryOrderStatus.WAIT_USE.getCode().equals(queryOrderStatus)){
+                List<Integer> orderStatuses = Arrays.asList(OrderStatus.RECEIPT.getCode(), OrderStatus.TAKE_ORDER.getCode());
+                queryOrdersDto.setOrderStatuses(orderStatuses);
+            }
+
         }
 
         // 兼容历史版本，如果传参是4 查询拆程4和5
@@ -4064,4 +4074,29 @@ public class OrderAdapter {
 
         return queryOrdersResponse;
     }
+
+
+    /**
+     * 转换制作中的文案，美业用待使用，其他用制作中
+     * @param orderBean
+     * @return
+     */
+    public String conventProduceString(QueryOrdersResponse.DataBean.OrderBean orderBean) {
+        if(String.valueOf(OrderClientType.BEAUTIFUL.getIndex()).equals(orderBean.getOrderClient())){
+            return "待使用";
+        }
+        return "制作中";
+    }
+
+    /**
+     * 转换待使用的文案，美业用待使用，其他用制作中
+     * @param orderBean
+     * @return
+     */
+    public String conventCreateOrderString(QueryOrdersResponse.DataBean.OrderBean orderBean) {
+        if(String.valueOf(OrderClientType.BEAUTIFUL.getIndex()).equals(orderBean.getOrderClient())){
+            return "待使用";
+        }
+        return "下单成功";
+    }
 }

order-application-service/src/main/java/cn/freemud/entities/vo/QueryOrderVo.java

@@ -34,7 +34,7 @@ public class QueryOrderVo {
      */
     private String oid;
     /**
-     * 订单状态 enum queryOrderStatus   全部订单 1 待取餐 2 已完成 3 全部   4.退款,5 待支付 ,6 已取消  7未支付取消
+     * 订单状态 enum queryOrderStatus   全部订单 1 待取餐 2 已完成 3 全部   4.退款,5 待支付 ,6 已取消  7未支付取消 8待使用（美业）
      */
     private Integer queryOrderStatus;
     /**

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

@@ -22,6 +22,8 @@ public enum OrderChannelType {
 
     SAASMALL("saasmall", "微商城"),
 
+    BEAUTIFUL("beautiful", "美业"),
+
     APP("app", "APP");
 
     private String code;

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

@@ -22,7 +22,10 @@ public enum QueryOrderStatus {
     NO_PAY(5, "待支付"),
     ORDER_CANCEL(6, "已取消"),
     //密雪
-    ORDER_CANCEL_MIXUE(7, "未支付已取消");
+    ORDER_CANCEL_MIXUE(7, "未支付已取消"),
+
+    // 美业专用
+    WAIT_USE(8, "待使用");
 
 
     private Integer code;

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

@@ -2724,6 +2724,12 @@ public class OrderServiceImpl implements Orderservice {
             createOrderVo.setPayChannelType(PayChannelType.TIKTOKPAY.getIndex());
             orderClient = OrderClientType.TIKTOKPAY;
         }
+
+        // 美业
+        if (OrderChannelType.BEAUTIFUL.getCode().equals(createOrderVo.getChannelType())) {
+            orderClient = OrderClientType.BEAUTIFUL;
+        }
+
         long totalAmount = 0;
         int cardAmount = 0;
         QueryOrdersResponse.DataBean.OrderBean fatherBeanListOne = new QueryOrdersResponse.DataBean.OrderBean();
@@ -3581,6 +3587,8 @@ public class OrderServiceImpl implements Orderservice {
             channelType = OrderChannelType.SAASMALL.getCode();
         } else if (UserLoginChannelEnum.APP.getCode().equals(userLoginInfoDto.getChannel())) {
             channelType = OrderChannelType.APP.getCode();
+        }else if(OrderChannelType.BEAUTIFUL.getCode().equals(queryOrderVo.getChannelType())){
+            channelType = OrderChannelType.BEAUTIFUL.getCode();
         }
         return channelType;
     }
@@ -4022,8 +4030,7 @@ public class OrderServiceImpl implements Orderservice {
 
     private Boolean isQueryEs(Integer queryOrderStatus) {
 
-        if(ObjectUtils.equals(QueryOrderStatus.TAKE_MEAL.getCode(),queryOrderStatus) || ObjectUtils.equals(QueryOrderStatus.NO_PAY.getCode(),queryOrderStatus)
-        || ObjectUtils.equals(QueryOrderStatus.REFUND_BILL.getCode(),queryOrderStatus)){
+        if(ObjectUtils.equals(QueryOrderStatus.TAKE_MEAL.getCode(),queryOrderStatus) || ObjectUtils.equals(QueryOrderStatus.NO_PAY.getCode(),queryOrderStatus)){
             return Boolean.FALSE;
         }
 

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

@@ -37,6 +37,7 @@ public enum OrderClientType {
     DPZHCT(24, "美团点评智慧餐厅"),
     FMWD(25, "非码微店"),
     TIKTOKPAY(27, "抖音小程序"),
+    BEAUTIFUL(28, "美业"),
     PARKING(99 , "农工商停车"),
     ;