结构调整，订单查询修改

car-wash-service/src/main/java/com/kym/service/awoara/entity/ApiList.java → car-wash-entity/src/main/java/com/kym/entity/awoara/ApiList.java

@@ -1,4 +1,4 @@
-package com.kym.service.awoara.entity;
+package com.kym.entity.awoara;
 
 import lombok.Data;
 import lombok.experimental.Accessors;

car-wash-service/src/main/java/com/kym/service/awoara/entity/Board.java → car-wash-entity/src/main/java/com/kym/entity/awoara/Board.java

@@ -1,4 +1,4 @@
-package com.kym.service.awoara.entity;
+package com.kym.entity.awoara;
 
 import lombok.Data;
 import lombok.experimental.Accessors;

car-wash-service/src/main/java/com/kym/service/awoara/entity/event/CardEventObject.java → car-wash-entity/src/main/java/com/kym/entity/awoara/CardEventObject.java

@@ -1,4 +1,4 @@
-package com.kym.service.awoara.entity.event;
+package com.kym.entity.awoara;
 
 public class CardEventObject {
     private Integer card_type;

car-wash-service/src/main/java/com/kym/service/awoara/entity/Config.java → car-wash-entity/src/main/java/com/kym/entity/awoara/Config.java

@@ -1,4 +1,4 @@
-package com.kym.service.awoara.entity;
+package com.kym.entity.awoara;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.Data;

car-wash-service/src/main/java/com/kym/service/awoara/entity/Detail.java → car-wash-entity/src/main/java/com/kym/entity/awoara/Detail.java

@@ -1,4 +1,4 @@
-package com.kym.service.awoara.entity;
+package com.kym.entity.awoara;
 
 import lombok.Data;
 import lombok.experimental.Accessors;

car-wash-service/src/main/java/com/kym/service/awoara/entity/event/DeviceState.java → car-wash-entity/src/main/java/com/kym/entity/awoara/DeviceState.java

@@ -1,4 +1,4 @@
-package com.kym.service.awoara.entity.event;
+package com.kym.entity.awoara;
 
 import lombok.Data;
 import lombok.experimental.Accessors;

car-wash-service/src/main/java/com/kym/service/awoara/entity/event/DeviceStateObject.java → car-wash-entity/src/main/java/com/kym/entity/awoara/DeviceStateObject.java

@@ -1,4 +1,4 @@
-package com.kym.service.awoara.entity.event;
+package com.kym.entity.awoara;
 
 import lombok.Data;
 

car-wash-service/src/main/java/com/kym/service/awoara/entity/event/Event.java → car-wash-entity/src/main/java/com/kym/entity/awoara/Event.java

@@ -1,4 +1,4 @@
-package com.kym.service.awoara.entity.event;
+package com.kym.entity.awoara;
 
 import lombok.Getter;
 

car-wash-service/src/main/java/com/kym/service/awoara/entity/event/MessageBody.java → car-wash-entity/src/main/java/com/kym/entity/awoara/MessageBody.java

@@ -1,4 +1,4 @@
-package com.kym.service.awoara.entity.event;
+package com.kym.entity.awoara;
 
 import lombok.Data;
 import lombok.experimental.Accessors;

car-wash-service/src/main/java/com/kym/service/awoara/entity/Method.java → car-wash-entity/src/main/java/com/kym/entity/awoara/Method.java

@@ -1,4 +1,4 @@
-package com.kym.service.awoara.entity;
+package com.kym.entity.awoara;
 
 import lombok.Getter;
 

car-wash-service/src/main/java/com/kym/service/awoara/entity/MethodHelp.java → car-wash-entity/src/main/java/com/kym/entity/awoara/MethodHelp.java

@@ -1,4 +1,4 @@
-package com.kym.service.awoara.entity;
+package com.kym.entity.awoara;
 
 import lombok.Data;
 import lombok.experimental.Accessors;

car-wash-service/src/main/java/com/kym/service/awoara/entity/Network.java → car-wash-entity/src/main/java/com/kym/entity/awoara/Network.java

@@ -1,4 +1,4 @@
-package com.kym.service.awoara.entity;
+package com.kym.entity.awoara;
 
 import lombok.Data;
 import lombok.experimental.Accessors;

car-wash-service/src/main/java/com/kym/service/awoara/entity/event/OrderInfo.java → car-wash-entity/src/main/java/com/kym/entity/awoara/OrderInfo.java

@@ -1,6 +1,6 @@
-package com.kym.service.awoara.entity.event;
+package com.kym.entity.awoara;
 
-import com.kym.service.awoara.entity.Detail;
+import com.kym.entity.awoara.Detail;
 import lombok.Data;
 import lombok.experimental.Accessors;
 

car-wash-service/src/main/java/com/kym/service/awoara/entity/event/OrderInfoObject.java → car-wash-entity/src/main/java/com/kym/entity/awoara/OrderInfoObject.java

@@ -1,4 +1,4 @@
-package com.kym.service.awoara.entity.event;
+package com.kym.entity.awoara;
 
 import lombok.Data;
 

car-wash-service/src/main/java/com/kym/service/awoara/entity/event/Payload.java → car-wash-entity/src/main/java/com/kym/entity/awoara/Payload.java

@@ -1,4 +1,4 @@
-package com.kym.service.awoara.entity.event;
+package com.kym.entity.awoara;
 
 import lombok.Data;
 import lombok.experimental.Accessors;

car-wash-service/src/main/java/com/kym/service/awoara/entity/event/UserLoginObject.java → car-wash-entity/src/main/java/com/kym/entity/awoara/UserLoginObject.java

@@ -1,4 +1,4 @@
-package com.kym.service.awoara.entity.event;
+package com.kym.entity.awoara;
 
 import lombok.Data;
 

car-wash-service/src/main/java/com/kym/service/awoara/entity/request/AwoaraRequest.java → car-wash-entity/src/main/java/com/kym/entity/awoara/request/AwoaraRequest.java

@@ -1,6 +1,6 @@
-package com.kym.service.awoara.entity.request;
+package com.kym.entity.awoara.request;
 
-import com.kym.service.awoara.entity.Method;
+import com.kym.entity.awoara.Method;
 import lombok.Builder;
 import lombok.Data;
 

car-wash-service/src/main/java/com/kym/service/awoara/entity/request/CloseOrderRequest.java → car-wash-entity/src/main/java/com/kym/entity/awoara/request/CloseOrderRequest.java

@@ -1,4 +1,4 @@
-package com.kym.service.awoara.entity.request;
+package com.kym.entity.awoara.request;
 
 import lombok.Data;
 import lombok.experimental.Accessors;

car-wash-service/src/main/java/com/kym/service/awoara/entity/request/CreateOrderRequest.java → car-wash-entity/src/main/java/com/kym/entity/awoara/request/CreateOrderRequest.java

@@ -1,4 +1,4 @@
-package com.kym.service.awoara.entity.request;
+package com.kym.entity.awoara.request;
 
 import lombok.Data;
 import lombok.experimental.Accessors;

car-wash-service/src/main/java/com/kym/service/awoara/entity/response/AwoaraResponse.java → car-wash-entity/src/main/java/com/kym/entity/awoara/response/AwoaraResponse.java

@@ -1,4 +1,4 @@
-package com.kym.service.awoara.entity.response;
+package com.kym.entity.awoara.response;
 
 import lombok.Data;
 import lombok.experimental.Accessors;

car-wash-service/src/main/java/com/kym/service/awoara/entity/response/CreateOrder.java → car-wash-entity/src/main/java/com/kym/entity/awoara/response/CreateOrder.java

@@ -1,4 +1,4 @@
-package com.kym.service.awoara.entity.response;
+package com.kym.entity.awoara.response;
 
 import lombok.Data;
 import lombok.experimental.Accessors;

car-wash-service/src/main/java/com/kym/service/awoara/entity/response/HardwareInfo.java → car-wash-entity/src/main/java/com/kym/entity/awoara/response/HardwareInfo.java

@@ -1,7 +1,7 @@
-package com.kym.service.awoara.entity.response;
+package com.kym.entity.awoara.response;
 
-import com.kym.service.awoara.entity.Board;
-import com.kym.service.awoara.entity.Network;
+import com.kym.entity.awoara.Board;
+import com.kym.entity.awoara.Network;
 import lombok.Data;
 import lombok.experimental.Accessors;
 

car-wash-service/src/main/java/com/kym/service/awoara/entity/response/State.java → car-wash-entity/src/main/java/com/kym/entity/awoara/response/State.java

@@ -1,7 +1,7 @@
-package com.kym.service.awoara.entity.response;
+package com.kym.entity.awoara.response;
 
-import com.kym.service.awoara.entity.event.DeviceState;
-import com.kym.service.awoara.entity.event.OrderInfo;
+import com.kym.entity.awoara.DeviceState;
+import com.kym.entity.awoara.OrderInfo;
 import lombok.Data;
 import lombok.experimental.Accessors;
 

car-wash-entity/src/main/java/com/kym/entity/miniapp/WashOrder.java

@@ -1,14 +1,18 @@
 package com.kym.entity.miniapp;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.kym.entity.BaseEntity;
-import java.io.Serializable;
-import java.time.LocalDateTime;
+import com.kym.entity.awoara.Detail;
+import com.kym.entity.typehandle.WashOrderDetailTypeHandle;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.experimental.Accessors;
 
+import java.time.LocalDateTime;
+import java.util.List;
+
 /**
  * <p>
  * 洗车订单表
@@ -19,7 +23,7 @@ import lombok.experimental.Accessors;
  */
 @Getter
 @Setter
-@TableName("t_wash_order")
+@TableName(value = "t_wash_order", autoResultMap = true)
 @Accessors(chain = true)
 public class WashOrder extends BaseEntity {
 
@@ -149,7 +153,8 @@ public class WashOrder extends BaseEntity {
     /**
      * 费用明细：name 名称 price 单价(单位分) seconds 时长(单位秒) amount 费用(单位分) space⻋位或场地，water清水，foam泡沫，cleaner吸尘，tap水龙头，user_ext用户扩展，消毒或吹干等功能，coat镀膜，blow吹气
      */
-    private String detail;
+    @TableField(typeHandler = WashOrderDetailTypeHandle.class)
+    private List<Detail> detail;
 
     /**
      * 开始时间
@@ -207,4 +212,5 @@ public class WashOrder extends BaseEntity {
      * 发票id
      */
     private Long invoiceId;
+
 }

car-wash-entity/src/main/java/com/kym/entity/miniapp/vo/InvoiceVo.java

@@ -1,10 +1,7 @@
 package com.kym.entity.miniapp.vo;
 
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.kym.entity.BaseEntity;
-import com.kym.entity.typehandle.InvoiceOrderDetailListTypeHandle;
 import com.kym.entity.wechat.InvoiceOrderDetail;
 import lombok.Getter;
 import lombok.NoArgsConstructor;

car-wash-entity/src/main/java/com/kym/entity/miniapp/vo/WashOrderVo.java

@@ -2,10 +2,12 @@ package com.kym.entity.miniapp.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.kym.entity.BaseEntity;
+import com.kym.entity.awoara.Detail;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
 import java.time.LocalDateTime;
+import java.util.List;
 
 /**
  * 洗车订单
@@ -74,7 +76,7 @@ public class WashOrderVo extends BaseEntity {
     /**
      * 费用明细：name 名称 price 单价(单位分) seconds 时长(单位秒) amount 费用(单位分) space⻋位或场地，water清水，foam泡沫，cleaner吸尘，tap水龙头，user_ext用户扩展，消毒或吹干等功能，coat镀膜，blow吹气
      */
-    private String detail;
+    private List<Detail> detail;
 
     /**
      * 开始时间

car-wash-entity/src/main/java/com/kym/entity/typehandle/WashOrderDetailTypeHandle.java

@@ -0,0 +1,30 @@
+package com.kym.entity.typehandle;
+
+import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.kym.entity.awoara.Detail;
+import com.kym.entity.wechat.FaPiao;
+
+import java.io.IOException;
+import java.util.List;
+
+/**
+ * @author skyline
+ * @description 洗车详情类型处理器
+ * https://github.com/baomidou/mybatis-plus-samples/blob/master/mybatis-plus-sample-typehandler/src/main/java/com/baomidou/mybatisplus/samples/typehandler/WalletListTypeHandler.java
+ */
+public class WashOrderDetailTypeHandle extends JacksonTypeHandler {
+    public WashOrderDetailTypeHandle(Class<?> type) {
+        super(type);
+    }
+
+    @Override
+    public Object parse(String json) {
+        try {
+            return getObjectMapper().readValue(json, new TypeReference<List<Detail>>() {
+            });
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+}

car-wash-mapper/src/main/resources/mappers/miniapp/WashOrderMapper.xml

@@ -27,7 +27,7 @@
         <result column="card_balance" property="cardBalance" />
         <result column="operation_remain_time" property="operationRemainTime" />
         <result column="idle_remain_time" property="idleRemainTime" />
-        <result column="detail" property="detail" />
+        <result column="detail" property="detail" typeHandler="com.kym.entity.typehandle.WashOrderDetailTypeHandle"/>
         <result column="start_time" property="startTime" />
         <result column="end_time" property="endTime" />
         <result column="discount_type" property="discountType" />

car-wash-service/src/main/java/com/kym/service/awoara/AwoaraService.java

@@ -1,12 +1,12 @@
 package com.kym.service.awoara;
 
-import com.kym.service.awoara.entity.ApiList;
-import com.kym.service.awoara.entity.Config;
-import com.kym.service.awoara.entity.MethodHelp;
-import com.kym.service.awoara.entity.event.OrderInfo;
-import com.kym.service.awoara.entity.response.CreateOrder;
-import com.kym.service.awoara.entity.response.HardwareInfo;
-import com.kym.service.awoara.entity.response.State;
+import com.kym.entity.awoara.ApiList;
+import com.kym.entity.awoara.Config;
+import com.kym.entity.awoara.MethodHelp;
+import com.kym.entity.awoara.OrderInfo;
+import com.kym.entity.awoara.response.CreateOrder;
+import com.kym.entity.awoara.response.HardwareInfo;
+import com.kym.entity.awoara.response.State;
 
 /**
  * @author skyline

car-wash-service/src/main/java/com/kym/service/awoara/AwoaraServiceImpl.java

@@ -4,14 +4,14 @@ import com.alibaba.fastjson2.JSONObject;
 import com.alibaba.fastjson2.TypeReference;
 import com.kym.common.exception.BusinessException;
 import com.kym.common.utils.CommUtil;
-import com.kym.service.awoara.entity.ApiList;
-import com.kym.service.awoara.entity.Config;
-import com.kym.service.awoara.entity.MethodHelp;
-import com.kym.service.awoara.entity.event.OrderInfo;
-import com.kym.service.awoara.entity.response.AwoaraResponse;
-import com.kym.service.awoara.entity.response.CreateOrder;
-import com.kym.service.awoara.entity.response.HardwareInfo;
-import com.kym.service.awoara.entity.response.State;
+import com.kym.entity.awoara.ApiList;
+import com.kym.entity.awoara.Config;
+import com.kym.entity.awoara.MethodHelp;
+import com.kym.entity.awoara.OrderInfo;
+import com.kym.entity.awoara.response.AwoaraResponse;
+import com.kym.entity.awoara.response.CreateOrder;
+import com.kym.entity.awoara.response.HardwareInfo;
+import com.kym.entity.awoara.response.State;
 import com.kym.service.mq.AliyunLotClient;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;

car-wash-service/src/main/java/com/kym/service/awoara/entity/event/handle/AwoaraEventHandler.java → car-wash-service/src/main/java/com/kym/service/awoara/event/handle/AwoaraEventHandler.java

@@ -1,6 +1,6 @@
-package com.kym.service.awoara.entity.event.handle;
+package com.kym.service.awoara.event.handle;
 
-import com.kym.service.awoara.entity.event.MessageBody;
+import com.kym.entity.awoara.MessageBody;
 
 /**
  * 石斑鱼上报事件处理器

car-wash-service/src/main/java/com/kym/service/awoara/entity/event/handle/BootEventHandler.java → car-wash-service/src/main/java/com/kym/service/awoara/event/handle/BootEventHandler.java

@@ -1,9 +1,9 @@
-package com.kym.service.awoara.entity.event.handle;
+package com.kym.service.awoara.event.handle;
 
 import com.kym.entity.miniapp.WashDevice;
 import com.kym.entity.miniapp.WashOrder;
-import com.kym.service.awoara.entity.event.DeviceStateObject;
-import com.kym.service.awoara.entity.event.MessageBody;
+import com.kym.entity.awoara.DeviceStateObject;
+import com.kym.entity.awoara.MessageBody;
 import com.kym.service.miniapp.WashDeviceService;
 import com.kym.service.miniapp.WashOrderService;
 import lombok.extern.slf4j.Slf4j;

car-wash-service/src/main/java/com/kym/service/awoara/entity/event/handle/CardEventHandler.java → car-wash-service/src/main/java/com/kym/service/awoara/event/handle/CardEventHandler.java

@@ -1,7 +1,7 @@
-package com.kym.service.awoara.entity.event.handle;
+package com.kym.service.awoara.event.handle;
 
-import com.kym.service.awoara.entity.event.CardEventObject;
-import com.kym.service.awoara.entity.event.MessageBody;
+import com.kym.entity.awoara.CardEventObject;
+import com.kym.entity.awoara.MessageBody;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 

car-wash-service/src/main/java/com/kym/service/awoara/entity/event/handle/DeviceStateEventHandler.java → car-wash-service/src/main/java/com/kym/service/awoara/event/handle/DeviceStateEventHandler.java

@@ -1,8 +1,8 @@
-package com.kym.service.awoara.entity.event.handle;
+package com.kym.service.awoara.event.handle;
 
+import com.kym.entity.awoara.MessageBody;
 import com.kym.entity.miniapp.WashDevice;
-import com.kym.service.awoara.entity.event.DeviceStateObject;
-import com.kym.service.awoara.entity.event.MessageBody;
+import com.kym.entity.awoara.DeviceStateObject;
 import com.kym.service.miniapp.WashDeviceService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;

car-wash-service/src/main/java/com/kym/service/awoara/entity/event/handle/OrderCloseEventHandler.java → car-wash-service/src/main/java/com/kym/service/awoara/event/handle/OrderCloseEventHandler.java

@@ -1,11 +1,10 @@
-package com.kym.service.awoara.entity.event.handle;
+package com.kym.service.awoara.event.handle;
 
-import com.alibaba.fastjson2.JSONArray;
 import com.kym.entity.miniapp.Account;
 import com.kym.entity.miniapp.WalletDetail;
 import com.kym.entity.miniapp.WashOrder;
-import com.kym.service.awoara.entity.event.MessageBody;
-import com.kym.service.awoara.entity.event.OrderInfoObject;
+import com.kym.entity.awoara.MessageBody;
+import com.kym.entity.awoara.OrderInfoObject;
 import com.kym.service.miniapp.AccountService;
 import com.kym.service.miniapp.WalletDetailService;
 import com.kym.service.miniapp.WashOrderService;
@@ -70,7 +69,7 @@ public class OrderCloseEventHandler implements AwoaraEventHandler<OrderInfoObjec
                     .setAmount(orderInfo.getAmount())
                     .setAmountReceivable(orderInfo.getAmount_receivable())
                     .setDiscountMoney(orderInfo.getDiscount_money())
-                    .setDetail(JSONArray.toJSONString(orderInfo.getDetail()))
+                    .setDetail(orderInfo.getDetail())
                     .setEndTime(LocalDateTime.now())
                     .setRechargePayment(rechargePayment)
                     .setGrantsPayment(grantsPayment)

car-wash-service/src/main/java/com/kym/service/awoara/entity/event/handle/OrderCreateEventHandler.java → car-wash-service/src/main/java/com/kym/service/awoara/event/handle/OrderCreateEventHandler.java

@@ -1,9 +1,9 @@
-package com.kym.service.awoara.entity.event.handle;
+package com.kym.service.awoara.event.handle;
 
 import com.kym.entity.miniapp.WashOrder;
-import com.kym.service.awoara.entity.event.MessageBody;
-import com.kym.service.awoara.entity.event.OrderInfo;
-import com.kym.service.awoara.entity.event.OrderInfoObject;
+import com.kym.entity.awoara.MessageBody;
+import com.kym.entity.awoara.OrderInfo;
+import com.kym.entity.awoara.OrderInfoObject;
 import com.kym.service.miniapp.WashOrderService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;

car-wash-service/src/main/java/com/kym/service/awoara/entity/event/handle/OrderUpdateEventHandler.java → car-wash-service/src/main/java/com/kym/service/awoara/event/handle/OrderUpdateEventHandler.java

@@ -1,8 +1,8 @@
-package com.kym.service.awoara.entity.event.handle;
+package com.kym.service.awoara.event.handle;
 
+import com.kym.entity.awoara.MessageBody;
+import com.kym.entity.awoara.OrderInfoObject;
 import com.kym.entity.miniapp.WashOrder;
-import com.kym.service.awoara.entity.event.MessageBody;
-import com.kym.service.awoara.entity.event.OrderInfoObject;
 import com.kym.service.miniapp.WashOrderService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;

car-wash-service/src/main/java/com/kym/service/awoara/entity/event/handle/UserLoginEventHandler.java → car-wash-service/src/main/java/com/kym/service/awoara/event/handle/UserLoginEventHandler.java

@@ -1,7 +1,7 @@
-package com.kym.service.awoara.entity.event.handle;
+package com.kym.service.awoara.event.handle;
 
-import com.kym.service.awoara.entity.event.MessageBody;
-import com.kym.service.awoara.entity.event.UserLoginObject;
+import com.kym.entity.awoara.MessageBody;
+import com.kym.entity.awoara.UserLoginObject;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 

car-wash-service/src/main/java/com/kym/service/awoara/factory/AwoaraEventHandlerFactory.java

@@ -1,9 +1,8 @@
 package com.kym.service.awoara.factory;
 
 import com.kym.common.exception.BusinessException;
-import com.kym.service.awoara.entity.event.DeviceStateObject;
-import com.kym.service.awoara.entity.event.Event;
-import com.kym.service.awoara.entity.event.handle.*;
+import com.kym.entity.awoara.Event;
+import com.kym.service.awoara.event.handle.*;
 import com.kym.service.miniapp.AccountService;
 import com.kym.service.miniapp.WalletDetailService;
 import com.kym.service.miniapp.WashDeviceService;

car-wash-service/src/main/java/com/kym/service/mq/MnsHandler.java

@@ -8,8 +8,8 @@ import com.aliyun.mns.client.CloudQueue;
 import com.aliyun.mns.client.MNSClient;
 import com.aliyun.mns.model.Message;
 import com.kym.service.awoara.factory.AwoaraEventHandlerFactory;
-import com.kym.service.awoara.entity.event.Event;
-import com.kym.service.awoara.entity.event.MessageBody;
+import com.kym.entity.awoara.Event;
+import com.kym.entity.awoara.MessageBody;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.text.StringEscapeUtils;
 import org.springframework.context.event.ContextRefreshedEvent;