Merge remote-tracking branch 'origin/feature/order' into feature/order

tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prod/ProdListVO.java

@@ -70,6 +70,10 @@ public class ProdListVO {
      * 还剩多少天
      */
     private Long remainingDays;
+    /**
+     * 图片
+     */
+    private String pic;
 
     /**
      * 审核备注

tashow-feign/tashow-trade-api/src/main/java/com/tashow/cloud/tradeapi/enums/order/TradeOrderStatusEnum.java

@@ -17,17 +17,15 @@ import java.util.Arrays;
 @Getter
 public enum TradeOrderStatusEnum implements ArrayValuable<Integer> {
 
-    UNPAID(0, "待支付"),
+    WAITPAID(10, "等待付款"),
-    UNDELIVERED(10, "待发货"),
+    WAITCONFIRM(20, "等待确定"),
-    DELIVERED(20, "已发货"),
+    WAITSERVE(30, "等待服务"),
-    COMPLETED(30, "已完成"),
+    WAITACCEPT(40, "等待验收"),
-    CANCELED(40, "已取消"),
+    COMPLETED(50, "已完成"),
-
+    CANCELED(60, "已取消"),
-    WAITPAID(100, "等待付款"),
+    DELIVERED(70, "已退款"),
-    WAITCONFIRM(110, "等待确定"),
+    WAITDELIVERED(80, "待发货"),
-    WAITSERVE(120, "等待服务"),
+    ;
-    WAITACCEPT(130, "等待验收"),
-    SERVECANCELED(140, "取消服务");
 
     public static final Integer[] ARRAYS = Arrays.stream(values()).map(TradeOrderStatusEnum::getStatus).toArray(Integer[]::new);
 
@@ -55,7 +53,7 @@ public enum TradeOrderStatusEnum implements ArrayValuable<Integer> {
      * @return 是否
      */
     public static boolean isUnpaid(Integer status) {
-        return ObjectUtil.equal(UNPAID.getStatus(), status);
+        return ObjectUtil.equal(WAITPAID.getStatus(), status);
     }
 
     /**
@@ -65,7 +63,7 @@ public enum TradeOrderStatusEnum implements ArrayValuable<Integer> {
      * @return 是否
      */
     public static boolean isUndelivered(Integer status) {
-        return ObjectUtil.equal(UNDELIVERED.getStatus(), status);
+        return ObjectUtil.equal(WAITDELIVERED.getStatus(), status);
     }
 
     /**
@@ -105,7 +103,7 @@ public enum TradeOrderStatusEnum implements ArrayValuable<Integer> {
      * @return 是否
      */
     public static boolean havePaid(Integer status) {
-        return ObjectUtils.equalsAny(status, UNDELIVERED.getStatus(),
+        return ObjectUtils.equalsAny(status, WAITCONFIRM.getStatus(),
                 DELIVERED.getStatus(), COMPLETED.getStatus());
     }
 

tashow-framework/tashow-common/src/main/java/com/tashow/cloud/common/util/date/LocalDateTimeUtils.java

@@ -196,6 +196,15 @@ public class LocalDateTimeUtils {
         return LocalDateTimeUtil.beginOfDay(LocalDateTime.now().minusDays(1));
     }
 
+    /**
+     * 获取day 天后的日期
+     *
+     * @return 昨天
+     */
+    public static LocalDateTime getPlusDay(Integer day) {
+        return LocalDateTimeUtil.beginOfDay(LocalDateTime.now().plusDays(day));
+    }
+
     /**
      * 获取本月的开始时间
      *

tashow-framework/tashow-common/src/main/java/com/tashow/cloud/common/util/json/databind/StringLocalDateTimeSerializer.java

@@ -0,0 +1,27 @@
+package com.tashow.cloud.common.util.json.databind;
+
+import cn.hutool.core.date.DatePattern;
+import cn.hutool.core.date.LocalDateTimeUtil;
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.databind.JsonSerializer;
+import com.fasterxml.jackson.databind.SerializerProvider;
+
+import java.io.IOException;
+import java.time.LocalDateTime;
+
+/**
+ * 基于字符串的 LocalDateTime 序列化器
+ *
+ * @author 老五
+ */
+public class StringLocalDateTimeSerializer extends JsonSerializer<LocalDateTime> {
+
+    public static final StringLocalDateTimeSerializer INSTANCE = new StringLocalDateTimeSerializer();
+
+    @Override
+    public void serialize(LocalDateTime value, JsonGenerator gen, SerializerProvider serializers) throws IOException {
+        // 将 LocalDateTime 对象，转换为 Long 时间戳
+        gen.writeString(LocalDateTimeUtil.format(value, DatePattern.NORM_DATETIME_FORMATTER) );
+    }
+
+}

tashow-module/tashow-module-ai/src/main/java/com/tashow/cloud/ai/controller/app/dialog/vo/AiDialogMessageRespVo.java

@@ -5,6 +5,8 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
+import java.time.LocalDateTime;
+
 import static com.tashow.cloud.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
 
 /**
@@ -70,7 +72,6 @@ public class AiDialogMessageRespVo {
      * 创建时间
      */
     @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
-    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime createTime;
-    private String createTime;
 
 }

tashow-module/tashow-module-ai/src/main/java/com/tashow/cloud/ai/controller/app/dialog/vo/TranslateRespVo.java

@@ -1,11 +1,11 @@
 package com.tashow.cloud.ai.controller.app.dialog.vo;
 
 
-import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.tashow.cloud.common.util.json.databind.StringLocalDateTimeSerializer;
 import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
 
-import static com.tashow.cloud.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+import java.time.LocalDateTime;
 
 /**
  * 翻译接口结果vo
@@ -40,8 +40,7 @@ public class TranslateRespVo {
     //文件时长
     private Long contentDuration;
     //发送时间
-    @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    @JsonSerialize(using = StringLocalDateTimeSerializer.class)
-    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime createTime;
-    private String createTime;
 
 }

tashow-module/tashow-module-ai/src/main/java/com/tashow/cloud/ai/dal/dataobject/dialog/AiDialogMessageDO.java

@@ -1,10 +1,14 @@
 package com.tashow.cloud.ai.dal.dataobject.dialog;
 
 import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.*;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.time.LocalDateTime;
 
+import static com.tashow.cloud.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
 /**
  * ai-对话消息 DO
  *
@@ -89,6 +93,8 @@ public class AiDialogMessageDO  {
      * 创建时间
      */
     @TableField(fill = FieldFill.INSERT)
+    @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime createTime;
 
 }

tashow-module/tashow-module-ai/src/main/java/com/tashow/cloud/ai/service/dialog/AiDialogServiceImpl.java

@@ -1,5 +1,6 @@
 package com.tashow.cloud.ai.service.dialog;
 
+import cn.hutool.core.date.LocalDateTimeUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.http.HttpRequest;
 import cn.hutool.http.HttpUtil;
@@ -30,8 +31,8 @@ import javax.sound.sampled.AudioSystem;
 import java.io.InputStream;
 import java.net.HttpURLConnection;
 import java.net.URL;
-import java.time.LocalDateTime;
 import java.util.Comparator;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -55,6 +56,17 @@ public class AiDialogServiceImpl extends ServiceImpl<AiDialogMapper, AiDialogDO>
     private FileApi fileApi;
 
 
+    private Map<String, String> petAvatars = new HashMap<>() {{
+        put("cat", "https://petshy.tashowz.com/admin-api/infra/file/29/get/89f4982de19aadae3248ffde37132857df255b3276de484fdf12e603e5e29a7e.png");
+        put("dog", "https://petshy.tashowz.com/admin-api/infra/file/29/get/175ba9f58dc812786bfe0598ca9c4a7f422fe138c1889e08d8228aebc953c1b3.png");
+    }};
+
+    private Map<String, String> petName = new HashMap<>() {{
+        put("cat", "猫猫・三胖");
+        put("dog", "狗狗・旺财");
+    }};
+
+
     @Override
     public DialogResp getDialog(Long userId) {
         AiDialogDO aiDialogDO = this.getOne(new LambdaQueryWrapper<AiDialogDO>().eq(AiDialogDO::getUserId, userId));
@@ -108,7 +120,7 @@ public class AiDialogServiceImpl extends ServiceImpl<AiDialogMapper, AiDialogDO>
                     .last("limit 1")
             );
             messageDO.setMessageOrder(aiDialogMessageDO == null ? 1 : aiDialogMessageDO.getMessageOrder() + 1);
-            messageDO.setCreateTime(LocalDateTime.now());
+            messageDO.setCreateTime(LocalDateTimeUtil.now());
         }
         int i = messageDO.getId() == null ? aiDialogMessageMapper.insert(messageDO) : aiDialogMessageMapper.updateById(messageDO);
         TranslateRespVo bean = BeanUtils.toBean(messageDO, TranslateRespVo.class);
@@ -136,7 +148,11 @@ public class AiDialogServiceImpl extends ServiceImpl<AiDialogMapper, AiDialogDO>
         //数据解析
         JSONObject translateResult = JSON.parseObject(result);
 
-        if (translateResult.isEmpty() || !translateResult.containsKey("intent_result") || !translateResult.getBoolean("is_species_sound")) {
+        if (translateResult.isEmpty()
+                || !translateResult.containsKey("intent_result")
+                || !translateResult.getBoolean("is_species_sound")
+                || translateResult.getInteger("confidence") < 0.7
+        ) {
             messageDO.setTransStatus(0);
             messageDO.setTransResult("");
             return messageDO;
@@ -148,16 +164,24 @@ public class AiDialogServiceImpl extends ServiceImpl<AiDialogMapper, AiDialogDO>
                 .getJSONObject("probabilities");
 
         String resultKey = probabilities.entrySet().stream()
-                .filter(entry -> entry.getValue() instanceof Number)
+                .filter(entry -> entry.getValue() instanceof Number && ((Number) entry.getValue()).doubleValue() > 0.7)
                 .max(Comparator.comparingDouble(entry -> ((Number) entry.getValue()).doubleValue()))
                 .map(Map.Entry::getKey)
                 .orElse(null);
 
         //返回结果
+        if (StrUtil.isBlank(resultKey)) {
+            messageDO.setTransStatus(0);
+            messageDO.setTransResult("");
+            return messageDO;
+        }
+
         //宠物档案 todo
         messageDO.setPetId(1l);
-        messageDO.setPetName(speciesLabels);
+        messageDO.setPetName(petName.get(speciesLabels));
-        messageDO.setPetAvatar("https://img1.baidu.com/it/u=1224902049,3440357835&fm=253&app=138&f=JPEG?w=801&h=800");
+        https:
+//qcloud.dpfile.com/pc/qw4HqeQN5Af9tLaw0mx8pXQhxKUCvwHbCXmSRI-nKiW1NpX6wMdvSN80YpcTbMKw.jpg
+        messageDO.setPetAvatar(petAvatars.get(speciesLabels));
         messageDO.setPetType(speciesLabels);
         messageDO.setTransStatus(1);
         messageDO.setTransResult(StrUtil.isBlank(resultKey) ? "" : resultKey.split(StrUtil.UNDERLINE)[1]);

tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/controller/admin/file/FileController.java

@@ -29,14 +29,13 @@ import static com.tashow.cloud.infra.framework.file.core.utils.FileTypeUtils.wri
 @RequestMapping("/infra/file")
 @Validated
 @Slf4j
-@PermitAll
 public class FileController {
 
   @Resource private FileService fileService;
 
   /** 上传文件", description = "模式一：后端上传文件 */
   @PostMapping("/upload")
-  public CommonResult<String> uploadFile(FileUploadReqVO uploadReqVO) throws Exception {
+  public CommonResult<String> uploadFile(@Valid FileUploadReqVO uploadReqVO) throws Exception {
     MultipartFile file = uploadReqVO.getFile();
     String path = uploadReqVO.getPath();
     return success(

tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/ProdController.java

@@ -121,15 +121,13 @@ public class ProdController {
 
 
 
-/*
+    @GetMapping("/getProdInfo")
-    @GetMapping("/get")
+    @Operation(summary = "获得商品详情a")
-    @Operation(summary = "获得商品")
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('tashow-module-product:prod:query')")
+    public CommonResult<ProdDO> getProdInfo(@RequestParam("id") Long id) {
-    public CommonResult<ProdRespVO> getProd(@RequestParam("id") Long id) {
         ProdDO prod = prodService.getProd(id);
-        return success(BeanUtils.toBean(prod, ProdRespVO.class));
+        return success(prod);
-    }*/
+    }
 
     @PermitAll
     @GetMapping("/page")

tashow-module/tashow-module-product/src/main/resources/application-local.yaml

@@ -7,10 +7,10 @@ spring:
       username: nacos # Nacos 账号
       password: nacos # Nacos 密码
       discovery: # 【配置中心】配置项
-        namespace: 16bd40df-7cc7-4c2c-82c2-6186ade7bb08 # 命名空间。这里使用 dev 开发环境
+        namespace: dev # 命名空间。这里使用 dev 开发环境
         group: DEFAULT_GROUP # 使用的 Nacos 配置分组，默认为 DEFAULT_GROUP
         metadata:
           version: 1.0.0 # 服务实例的版本号，可用于灰度发布
       config: # 【注册中心】配置项
-        namespace: 16bd40df-7cc7-4c2c-82c2-6186ade7bb08 # 命名空间。这里使用 dev 开发环境
+        namespace: dev # 命名空间。这里使用 dev 开发环境
         group: DEFAULT_GROUP # 使用的 Nacos 配置分组，默认为 DEFAULT_GROUP

tashow-module/tashow-module-product/src/main/resources/mapper/product/ProdMapper.xml

@@ -585,7 +585,7 @@
 
     <select id="getProdPageList" resultMap="ProdListMap" >
         select tp.prod_id,tp.prod_name,tp.category_name,tp.shop_id,tsd.shop_name,tpsa.area_name,min_eri.response_hours,
-        tprc.reservation_time_slots,tp.delete_time,tp.create_time,tp.update_time,tp.status,tp.is_prohibit,
+        tprc.reservation_time_slots,tp.delete_time,tp.create_time,tp.update_time,tp.status,tp.is_prohibit,tp.pic,
         tp.process_notes processNotes
         from tz_prod tp
         left join tz_shop_detail tsd on tp.shop_id = tsd.shop_id

tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/dal/dataobject/oauth2/OAuth2AccessTokenDO.java

@@ -70,6 +70,7 @@ public class OAuth2AccessTokenDO extends TenantBaseDO {
     /**
      * 过期时间
      */
+
     private LocalDateTime expiresTime;
 
 }

tashow-module/tashow-module-trade/src/main/java/com/tashow/cloud/trade/controller/admin/order/TradeOrderController.java

@@ -5,8 +5,9 @@ import com.tashow.cloud.common.pojo.CommonResult;
 import com.tashow.cloud.common.pojo.PageResult;
 import com.tashow.cloud.memberapi.api.user.MemberUserApi;
 import com.tashow.cloud.trade.controller.admin.order.vo.TradeOrderDetailRespVO;
-import com.tashow.cloud.trade.controller.admin.order.vo.TradeOrderPageRespVO;
 import com.tashow.cloud.trade.controller.admin.order.vo.TradeOrderPageReqVO;
+import com.tashow.cloud.trade.controller.admin.order.vo.TradeOrderPageRespVO;
+import com.tashow.cloud.trade.controller.admin.order.vo.TradeOrderSummaryRespVO;
 import com.tashow.cloud.trade.convert.order.TradeOrderConvert;
 import com.tashow.cloud.trade.dal.dataobject.order.TradeOrderDO;
 import com.tashow.cloud.trade.dal.dataobject.order.TradeOrderItemDO;
@@ -87,20 +88,22 @@ public class TradeOrderController {
         // 查询订单项
         List<TradeOrderItemDO> orderItems = tradeOrderQueryService.getOrderItemListByOrderId(id);
 
-        // 拼接数据
-//        MemberUserRespDTO user = memberUserApi.getUser(order.getUserId()).getCheckedData();
-//        MemberUserRespDTO brokerageUser = order.getBrokerageUserId() != null ?
-//                memberUserApi.getUser(order.getBrokerageUserId()).getCheckedData() : null;
         List<TradeOrderLogDO> orderLogs = tradeOrderLogService.getOrderLogListByOrderId(id);
-        return success(TradeOrderConvert.INSTANCE.convert(order, orderItems, orderLogs, null, null));
+        return success(TradeOrderConvert.INSTANCE.convert(order, orderItems, orderLogs));
     }
 
-//    // 获得交易订单统计
+    //
-//    @GetMapping("/summary")
+
+    /**
+     * 获得交易订单统计
+     * @return
+     */
+    @GetMapping("/summary")
+    @PermitAll
 //    @PreAuthorize("@ss.hasPermission('trade:order:query')")
-//    public CommonResult<TradeOrderSummaryRespVO> getOrderSummary(TradeOrderPageReqVO reqVO) {
+    public CommonResult<TradeOrderSummaryRespVO> getOrderSummary() {
-//        return success(tradeOrderQueryService.getOrderSummary(reqVO));
+        return success(tradeOrderQueryService.getOrderSummary());
-//    }
+    }
 //
 //    // 获得交易订单的物流轨迹
 //    // id: 交易订单编号

tashow-module/tashow-module-trade/src/main/java/com/tashow/cloud/trade/controller/admin/order/vo/TradeOrderBaseVO.java

@@ -2,6 +2,12 @@ package com.tashow.cloud.trade.controller.admin.order.vo;
 
 // 移除Swagger相关导入
 
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.tashow.cloud.common.enums.TerminalEnum;
+import com.tashow.cloud.common.util.json.databind.StringLocalDateTimeSerializer;
+import com.tashow.cloud.common.validation.InEnum;
+import com.tashow.cloud.tradeapi.enums.order.TradeOrderStatusEnum;
+import com.tashow.cloud.tradeapi.enums.order.TradeOrderTypeEnum;
 import lombok.Data;
 
 import java.time.LocalDateTime;
@@ -15,17 +21,27 @@ public class TradeOrderBaseVO {
     // 订单编号
     private Long id;
 
-    // 订单流水号
+    // 订单编号
     private String orderNum;
 
-    // 下单时间
+    /**
-    private LocalDateTime createTime;
+     * 订单类型
+     * {@link TradeOrderTypeEnum#getType()}
+     */
+    private Integer orderType;
 
-    // 订单类目
+    /**
-    private String orderCategoryName;
+     * 订单来源
-
+     * {@link TerminalEnum#getTerminal()}
-    // 订单来源
+     */
+    @InEnum(TerminalEnum.class)
     private Integer orderTerminal;
+    /**
+     * 订单状态
+     * {@link TradeOrderStatusEnum#getStatus()}
+     */
+    @InEnum(TradeOrderStatusEnum.class)
+    private Integer orderStatus;
 
     // 用户编号
     private Long userId;
@@ -37,35 +53,14 @@ public class TradeOrderBaseVO {
     private String userAvatar;
     //用户手机号
     private String userMobile;
-    // 订单状态
-    private Integer orderStatus;
-
-    //商品图片
-    private String picUrl;
-    //商品名称
-    private String spuName;
-    //商品规格
-    private String skuName;
-    // 购买的商品数量
-    private Integer count;
-    // 单价
-    private Integer price;
-    //到手价
-    private Integer handedPrice;
-    //实付金额
-    private Integer payPrice;
-    // 单位
-    private String unit;
-
-    //预约时间
-    private String subTime;
-    //服务地址
-    private String serveAddress;
     // 用户备注 - 必填，示例：你猜
     private String userRemark;
-    //支付方式
+
-    private String payType;
+    // 下单时间
-    //财务状态
+    @JsonSerialize(using = StringLocalDateTimeSerializer.class)
-    private String financeStatus;
+    private LocalDateTime createTime;
+    // 订单完成时间
+    @JsonSerialize(using = StringLocalDateTimeSerializer.class)
+    private LocalDateTime finishTime;
 
 }

tashow-module/tashow-module-trade/src/main/java/com/tashow/cloud/trade/controller/admin/order/vo/TradeOrderDetailRespVO.java

@@ -2,6 +2,10 @@ package com.tashow.cloud.trade.controller.admin.order.vo;
 
 // 移除Swagger相关导入
 
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.tashow.cloud.common.util.json.databind.StringLocalDateTimeSerializer;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
@@ -11,151 +15,112 @@ import java.util.List;
 // 管理后台 - 交易订单的详情 Response VO
 @Data
 @Accessors(chain = true)
-public class TradeOrderDetailRespVO extends TradeOrderBaseVO {
+public class TradeOrderDetailRespVO extends TradeOrderBaseVO{
 
-    //基本信息
+    //订单类目id
-    private TradeOrderBaseInfo tradeOrderInfoBase;
+    private Long orderCategoryId;
-    //商品信息
+    //订单类目名称
-    private TradeProductInfo tradeProductInfo;
+    private String orderCategoryName;
-    //扩展服务信息
-    private String tradeExtendServeInfo;
-    //附加费信息
-    private  String tradeExtendCostInfo;
-
-    //配送信息
-    private TradeDeliveryInfo tradeDeliveryInfo;
 
+    //取消原因
+    private String cancelReason;
+    //商家备注
+    private String merchantRemark;
+    //退款时间
+    private LocalDateTime refundTime;
+    //保障时间
+    private LocalDateTime propertyTime;
+    //保障状态
+    private Integer propertyStatus;
+    //订单金额
+    private Integer price;
+    //实付金额
+    private Integer payPrice;
+    //优惠金额
+    private Integer discountPrice;
+    //退款金额
+    private Integer refundPrice;
+    //实收金额
+    private Integer livePrice;
+    //支付方式
+    private Integer payType;
+    //支付渠道 （线上线下）
+    private Integer payChannelCode;
+    //倒计时()
+    private String payLastTime;
+    //财务状态
+    private Integer financeStatus;
+    //交易流水号
+    private String payOrderId;
+    //支付时间
+    @JsonSerialize(using = StringLocalDateTimeSerializer.class)
+    private LocalDateTime payTime;
+    //取消时间
+    @JsonSerialize(using = StringLocalDateTimeSerializer.class)
+    private LocalDateTime cancelTime;
+    //订单状态流转记录
+    List<TradeOrderStatusRespVo> statusList;
+    //商品列表
+    private List<Item> items;
 
+    //服务信息(order_serve_info配置)
+    private JSONObject tradeServeInfo;
+    //扩展服务信息(order_serve_info配置)
+    private JSONArray tradeExtendServeInfo;
+    //附加费信息(order_serve_info配置)
+    private JSONArray tradeExtendCostInfo;
 
     @Data
-    @Accessors(chain = true)
+    public static class Item {
-    class TradeProductInfo{
 
-        //店铺log
+        //店铺名称
-        private String shopLogoUrl;
+        private Long id;
         //店铺名称
         private String shopName;
+        //店铺logo
+        private String shopLogo;
 
         //商品id
         private Long spuId;
-        //skuid
+        //skuId
         private Long skuId;
+        //商品图片
+        private String picUrl;
 
-        //商品规格图
-        private String skuPicUrl;
         //商品名称
         private String spuName;
         //商品规格
         private String skuName;
-        //购买数量
+        //订单类目id
-        private Integer count;
+        private Long orderCategoryId;
-        //商品单价
+        //订单类目名称
-        private Integer price;
+        private String orderCategoryName;
-        //商品单位
-        private String unit;
-        //到手价（单价 - 优惠）
-        private Integer handedPrice;
-        //成本价
-        private Integer expensePrice;
-        //保障
-        private List<String> properties;
-        //服务内容
-        private String serveContent;
 
+
+        // 购买的商品数量
+        private Integer count;
+        // 订单总价
+        private Integer price;
+        // 单位
+        private String unit;
         //商品总价
         private Integer totalPrice;
         //优惠金额
         private Integer discountPrice;
         //实付金额
         private Integer payPrice;
-
         //累计退款金额
         private Integer refundPrice;
         //累计退款数量
         private Integer refundCount;
+        //到手价
+        private Integer handedPrice;
+        //成本价
+        private Integer expensePrice;
 
+        //服务保障列表
+        private String properties;
+        //服务内容
+        private String serveContent;
     }
-
-    @Data
-    @Accessors(chain = true)
-    class TradeOrderBaseInfo{
-        //订单id
-        private String id;
-        //订单编号
-        private String orderNo;
-        //订单状态
-        private String orderStatus;
-        //订单类型
-        private String orderType;
-        //订单类目
-        private String orderCategoryNameAndId;
-        //订单来源
-        private String orderTerminal;
-        //用户信息
-        private String userInfo;
-
-        //取消时间
-        private LocalDateTime cancelTime;
-        //取消原因
-        private String cancelReason;
-        //商家备注
-        private String merchantRemark;
-
-        //退款时间
-        private String refundTime;
-
-        //保障时间
-        private String propertyTime;
-        //保障状态
-        private String propertyStatus;
-
-        //订单总价
-        private String price;
-        //优惠金额
-        private String discountPrice;
-        //实付金额
-        private Integer payPrice;
-        //退款金额
-        private String refundPrice;
-        //实收金额
-        private String livePrice;
-
-        //支付方式（支付宝微信）
-        private String payType;
-        //支付渠道 （线上线下）
-        private String payChannelCode;
-        //交易流水号
-        private String payOrderId;
-        //支付时间
-        private LocalDateTime payTime;
-
-        //创建时间
-        private LocalDateTime createTime;
-        //完成时间
-        private LocalDateTime finishTime;
-
-    }
-
-    @Data
-    @Accessors(chain = true)
-    class TradeDeliveryInfo{
-        //承运方
-        private String logisticsName;
-        //送货方式
-        private String logisticsType;
-        //送货上门
-        private String logisticsNum;
-        //收货人
-        private String receiverName;
-        //收货手机
-        private String receiverMobile;
-        //收货地址
-        private String receiverDetailAddress;
-        //快递详情
-        private String deliveryDetail;
-    }
-
-
-
-
 }

tashow-module/tashow-module-trade/src/main/java/com/tashow/cloud/trade/controller/admin/order/vo/TradeOrderItemBaseVO.java

@@ -1,6 +1,7 @@
 package com.tashow.cloud.trade.controller.admin.order.vo;
 
 // 移除Swagger相关导入
+
 import lombok.Data;
 
 /**
@@ -8,60 +9,7 @@ import lombok.Data;
  * 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成
  */
 @Data
-public class TradeOrderItemBaseVO {
+public class TradeOrderItemBaseVO extends TradeOrderBaseVO{
 
-    // ========== 订单项基本信息 ==========
-
-    // 编号 - 必填，示例：1
-    private Long id;
-
-    // 用户编号 - 必填，示例：1
-    private Long userId;
-
-    // 订单编号 - 必填，示例：1
-    private Long orderId;
-
-    // ========== 商品基本信息 ==========
-
-    // 商品 SPU 编号 - 必填，示例：1
-    private Long spuId;
-
-    // 商品 SPU 名称 - 必填，示例：芋道源码
-    private String spuName;
-
-    // 商品 SKU 编号 - 必填，示例：1
-    private Long skuId;
-
-    // 商品图片 - 必填，示例：https://www.iocoder.cn/1.png
-    private String picUrl;
-
-    // 购买数量 - 必填，示例：1
-    private Integer count;
-
-    // ========== 价格 + 支付基本信息 ==========
-
-    // 商品原价（单） - 必填，示例：100
-    private Integer price;
-
-    // 商品优惠（总） - 必填，示例：100
-    private Integer discountPrice;
-
-    // 商品实付金额（总） - 必填，示例：100
-    private Integer payPrice;
-
-    // 子订单分摊金额（总） - 必填，示例：100
-    private Integer orderPartPrice;
-
-    // 分摊后子订单实付金额（总） - 必填，示例：100
-    private Integer orderDividePrice;
-
-    // ========== 营销基本信息 ==========
-
-    // TODO 芋艿：在捉摸一下
-
-    // ========== 售后基本信息 ==========
-
-    // 售后状态 - 必填，示例：1
-    private Integer afterSaleStatus;
 
 }

tashow-module/tashow-module-trade/src/main/java/com/tashow/cloud/trade/controller/admin/order/vo/TradeOrderPageRespVO.java

@@ -1,11 +1,52 @@
 package com.tashow.cloud.trade.controller.admin.order.vo;
 
 
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.tashow.cloud.common.util.json.databind.StringLocalDateTimeSerializer;
 import lombok.Data;
 
+import java.time.LocalDateTime;
+import java.util.List;
+
 // 管理后台 - 交易订单的分页项 Response VO
 @Data
 public class TradeOrderPageRespVO extends TradeOrderBaseVO {
 
+    //订单项列表
+    private List<Item> items;
+    //店铺名称
+    private String shopName;
+    //店铺log
+    private String shopLogo;
+    //支付剩余时间
+    private String payLastTime;
+
+
+    @Data
+    public static class Item {
+        //商品图片
+        private String picUrl;
+        //商品名称
+        private String spuName;
+        //商品规格
+        private String skuName;
+        // 购买的商品数量
+        private Integer count;
+        // 订单总价
+        private Integer price;
+        // 订单总价
+        private Integer discountPrice;
+        //到手价
+        private Integer handedPrice;
+        //实付金额
+        private Integer payPrice;
+        // 单位
+        private String unit;
+        //预约时间
+        @JsonSerialize(using = StringLocalDateTimeSerializer.class)
+        private LocalDateTime subTime;
+        //服务地址
+        private String serveAddress;
+    }
 
 }

tashow-module/tashow-module-trade/src/main/java/com/tashow/cloud/trade/controller/admin/order/vo/TradeOrderStatusRespVo.java

@@ -0,0 +1,43 @@
+package com.tashow.cloud.trade.controller.admin.order.vo;
+
+import com.tashow.cloud.trade.dal.dataobject.order.TradeOrderDO;
+import com.tashow.cloud.tradeapi.enums.order.TradeOrderOperateTypeEnum;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Data
+public class TradeOrderStatusRespVo {
+
+    private Long id;
+    /**
+     * 订单号
+     *
+     * 关联 {@link TradeOrderDO#getId()}
+     */
+    private Long orderId;
+    /**
+     * 操作前状态
+     */
+    private Integer beforeStatus;
+    /**
+     * 操作后状态
+     */
+    private Integer afterStatus;
+
+    /**
+     * 操作类型
+     *
+     * {@link TradeOrderOperateTypeEnum}
+     */
+    private Integer operateType;
+    /**
+     * 订单日志信息
+     */
+    private String content;
+
+    /**
+     * 订单日志信息
+     */
+    private LocalDateTime createTime;
+}

tashow-module/tashow-module-trade/src/main/java/com/tashow/cloud/trade/controller/admin/order/vo/TradeOrderSummaryRespVO.java

@@ -10,13 +10,10 @@ public class TradeOrderSummaryRespVO {
     // 订单数量 - 必填，示例：1024
     private Long orderCount;
 
-    // 订单金额 - 必填，示例：1024
+    // 实付金额 - 必填，示例：1024
-    private Long orderPayPrice;
+    private Long payPrice;
 
-    // 退款单数 - 必填，示例：1024
+    // 最终实收金额 - 必填，示例：1024
-    private Long afterSaleCount;
+    private Long livePrice;
-
-    // 退款金额 - 必填，示例：1024
-    private Long afterSalePrice;
 
 }

tashow-module/tashow-module-trade/src/main/java/com/tashow/cloud/trade/controller/app/order/AppTradeOrderController.java

@@ -137,12 +137,12 @@ public class AppTradeOrderController {
         Map<String, Long> orderCount = Maps.newLinkedHashMapWithExpectedSize(5);
         // 全部
         orderCount.put("allCount", tradeOrderQueryService.getOrderCount(getLoginUserId(), null, null));
-        // 待付款（未支付）
+//        // 待付款（未支付）
-        orderCount.put("unpaidCount", tradeOrderQueryService.getOrderCount(getLoginUserId(),
+//        orderCount.put("unpaidCount", tradeOrderQueryService.getOrderCount(getLoginUserId(),
-                TradeOrderStatusEnum.UNPAID.getStatus(), null));
+//                TradeOrderStatusEnum.UNPAID.getStatus(), null));
-        // 待发货
+//        // 待发货
-        orderCount.put("undeliveredCount", tradeOrderQueryService.getOrderCount(getLoginUserId(),
+//        orderCount.put("undeliveredCount", tradeOrderQueryService.getOrderCount(getLoginUserId(),
-                TradeOrderStatusEnum.UNDELIVERED.getStatus(), null));
+//                TradeOrderStatusEnum.UNDELIVERED.getStatus(), null));
         // 待收货
         orderCount.put("deliveredCount", tradeOrderQueryService.getOrderCount(getLoginUserId(),
                 TradeOrderStatusEnum.DELIVERED.getStatus(), null));

tashow-module/tashow-module-trade/src/main/java/com/tashow/cloud/trade/convert/aftersale/AfterSaleConvert.java

@@ -30,6 +30,7 @@ public interface AfterSaleConvert {
 
     @Mappings({
             @Mapping(target = "id", ignore = true),
+            @Mapping(target = "refundPrice", ignore = true),
             @Mapping(target = "createTime", ignore = true),
             @Mapping(target = "updateTime", ignore = true),
             @Mapping(target = "creator", ignore = true),

tashow-module/tashow-module-trade/src/main/java/com/tashow/cloud/trade/convert/order/TradeOrderConvert.java

@@ -2,8 +2,11 @@ package com.tashow.cloud.trade.convert.order;
 
 import cn.hutool.core.util.BooleanUtil;
 import cn.hutool.core.util.StrUtil;
+import com.alibaba.fastjson.JSON;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.tashow.cloud.common.pojo.PageResult;
 import com.tashow.cloud.common.util.collection.CollectionUtils;
+import com.tashow.cloud.common.util.date.LocalDateTimeUtils;
 import com.tashow.cloud.common.util.ip.AreaUtils;
 import com.tashow.cloud.common.util.string.StrUtils;
 import com.tashow.cloud.excel.dict.core.DictFrameworkUtils;
@@ -29,15 +32,18 @@ import com.tashow.cloud.trade.service.brokerage.bo.BrokerageAddReqBO;
 import com.tashow.cloud.trade.service.price.bo.TradePriceCalculateReqBO;
 import com.tashow.cloud.trade.service.price.bo.TradePriceCalculateRespBO;
 import com.tashow.cloud.tradeapi.api.order.dto.TradeOrderRespDTO;
+import com.tashow.cloud.tradeapi.enums.order.TradeOrderStatusEnum;
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
 import org.mapstruct.Mappings;
 import org.mapstruct.Named;
 import org.mapstruct.factory.Mappers;
 
+import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 
 import static com.tashow.cloud.common.util.collection.CollectionUtils.convertMap;
 import static com.tashow.cloud.common.util.collection.CollectionUtils.convertMultiMap;
@@ -50,15 +56,16 @@ public interface TradeOrderConvert {
     TradeOrderConvert INSTANCE = Mappers.getMapper(TradeOrderConvert.class);
 
     //region  分页结果
-
     default PageResult<TradeOrderPageRespVO> convertPage(PageResult<TradeOrderDO> pageResult, List<TradeOrderItemDO> orderItems) {
-        Map<Long, TradeOrderItemDO> orderItemMap = convertMap(orderItems, TradeOrderItemDO::getOrderId);
+        Map<Long, List<TradeOrderItemDO>> orderItemMap = convertMultiMap(orderItems, TradeOrderItemDO::getOrderId);
         // 转化 List
         List<TradeOrderPageRespVO> orderVOs = CollectionUtils.convertList(pageResult.getList(), order -> {
-            TradeOrderItemDO itemDO = orderItemMap.get(order.getId());
+            List<TradeOrderItemDO> itemDO = orderItemMap.get(order.getId());
-            TradeOrderPageRespVO orderVO = convert(order, itemDO);
+            TradeOrderPageRespVO orderPageRespVO = convert(order, itemDO);
-            orderVO.setHandedPrice(itemDO.getPrice()-itemDO.getDiscountPrice());
+            orderPageRespVO.getItems().stream().forEach(item -> {
-            return orderVO;
+                item.setHandedPrice(item.getPrice() - item.getDiscountPrice());
+            });
+            return orderPageRespVO;
         });
         return new PageResult<>(orderVOs, pageResult.getTotal());
     }
@@ -66,11 +73,55 @@ public interface TradeOrderConvert {
     @Mappings({
             @Mapping(source = "order.id", target = "id"),
             @Mapping(source = "order.userId", target = "userId"),
-            @Mapping(source = "items.createTime", target = "createTime"),
-            @Mapping(source = "items.price", target = "price"),
-            @Mapping(source = "items.payPrice", target = "payPrice"),
     })
-    TradeOrderPageRespVO convert(TradeOrderDO order, TradeOrderItemDO items);
+    TradeOrderPageRespVO convert(TradeOrderDO order, List<TradeOrderItemDO> items);
+    //endregion
+
+    //region 订单详情
+    default TradeOrderDetailRespVO convert(TradeOrderDO order, List<TradeOrderItemDO> orderItems, List<TradeOrderLogDO> orderLogs) {
+        //订单基本信息
+        TradeOrderDetailRespVO orderVO = convert2(order, orderItems, orderLogs);
+        //计算商品到手价
+        orderVO.getItems().stream().forEach(item -> {
+            item.setHandedPrice(item.getPrice() - item.getDiscountPrice());
+            item.setTotalPrice(item.getPrice() * item.getCount() - item.getDiscountPrice());
+            //产品类目在订单详情里
+            orderVO.setOrderCategoryId(item.getOrderCategoryId());
+            orderVO.setOrderCategoryName(item.getOrderCategoryName());
+            //todo 服务保障列表  properties 服务内容 serveContent
+        });
+        //服务信息
+        orderItems.stream().filter(a->StrUtil.isNotBlank(a.getServeInfo())).findAny().ifPresent(a -> {
+            orderVO.setTradeServeInfo(JSON.parseObject(a.getServeInfo()));
+            orderVO.setTradeExtendServeInfo(JSON.parseArray(a.getServeExtInfo()));
+            orderVO.setTradeExtendCostInfo(JSON.parseArray(a.getPriceExtInfo()));
+        });
+
+        //保障时间  保障状态 如果状态是已完成 则
+        if (Objects.equals(order.getOrderStatus(), TradeOrderStatusEnum.COMPLETED.getStatus())) {
+            LocalDateTime finishTime = order.getFinishTime();
+            Long between = LocalDateTimeUtils.between(finishTime);
+
+            orderVO.setPropertyStatus(between >= 7 ? 0 : 1);
+            orderVO.setPropertyTime(LocalDateTimeUtils.getPlusDay(7));
+        }
+        return orderVO;
+    }
+
+    //    @Mappings(
+//        @Mapping(target ="items.tradeServeInfo", source = "tradeServeInfo",qualifiedByName = "jsonToMap")
+//    )
+    TradeOrderDetailRespVO convert2(TradeOrderDO order, List<TradeOrderItemDO> items, List<TradeOrderLogDO> statusList);
+
+    @Named("jsonToMap")
+    default Map<String, Object> jsonToMap(String json) {
+        try {
+            return new ObjectMapper().readValue(json, Map.class);
+        } catch (Exception e) {
+            throw new RuntimeException("json转换map出错", e);
+        }
+    }
+
     //endregion
 
     @Mappings({
@@ -123,27 +174,6 @@ public interface TradeOrderConvert {
         return createReqDTO;
     }
 
-
-//    ProductPropertyValueDetailRespVO convert(ProductPropertyValueDetailRespDTO bean);
-
-    default TradeOrderDetailRespVO convert(TradeOrderDO order, List<TradeOrderItemDO> orderItems,
-                                           List<TradeOrderLogDO> orderLogs,
-                                           MemberUserRespDTO user, MemberUserRespDTO brokerageUser) {
-        TradeOrderDetailRespVO orderVO = convert2(order, orderItems);
-//        // 处理收货地址
-//        orderVO.setReceiverAreaName(AreaUtils.format(order.getReceiverAreaId()));
-//        // 处理用户信息
-//        orderVO.setUser(convert(user));
-//        orderVO.setBrokerageUser(convert(brokerageUser));
-//        // 处理日志
-//        orderVO.setLogs(convertList03(orderLogs));
-        return orderVO;
-    }
-
-    List<TradeOrderDetailRespVO> convertList03(List<TradeOrderLogDO> orderLogs);
-
-    TradeOrderDetailRespVO convert2(TradeOrderDO order, List<TradeOrderItemDO> items);
-
     MemberUserRespVO convert(MemberUserRespDTO bean);
 
     default PageResult<AppTradeOrderPageItemRespVO> convertPage02(PageResult<TradeOrderDO> pageResult,
@@ -159,8 +189,6 @@ public interface TradeOrderConvert {
 
     AppTradeOrderPageItemRespVO convert02(TradeOrderDO order, List<TradeOrderItemDO> items);
 
-//    AppProductPropertyValueDetailRespVO convert02(ProductPropertyValueDetailRespDTO bean);
-
     default AppTradeOrderDetailRespVO convert02(TradeOrderDO order, List<TradeOrderItemDO> orderItems,
                                                 TradeOrderProperties tradeOrderProperties,
                                                 DeliveryExpressDO express) {
@@ -192,10 +220,6 @@ public interface TradeOrderConvert {
             @Mapping(target = "anonymous", source = "createReqVO.anonymous"),
             @Mapping(target = "userId", source = "tradeOrderItemDO.userId")
     })
-//    ProductCommentCreateReqDTO convert04(AppTradeOrderItemCommentCreateReqVO createReqVO, TradeOrderItemDO tradeOrderItemDO);
-//
-//    TradePriceCalculateReqBO convert(AppTradeOrderSettlementReqVO settlementReqVO);
-//
     default TradePriceCalculateReqBO convert(Long userId, AppTradeOrderSettlementReqVO settlementReqVO,
                                              List<CartDO> cartList) {
         TradePriceCalculateReqBO reqBO = new TradePriceCalculateReqBO().setUserId(userId)
@@ -262,7 +286,4 @@ public interface TradeOrderConvert {
         return bo;
     }
 
-    @Named("convertList04")
-    List<TradeOrderRespDTO> convertList04(List<TradeOrderDO> list);
-
 }

tashow-module/tashow-module-trade/src/main/java/com/tashow/cloud/trade/dal/dataobject/order/TradeOrderDO.java

@@ -32,14 +32,7 @@ public class TradeOrderDO extends BaseDO {
      * 订单流水号
      */
     private String orderNum;
-    /**
+
-     * 订单类目id
-     */
-    private Long orderCategoryId;
-    /**
-     * 订单类目名称
-     */
-    private String orderCategoryName;
     /**
      * 订单类型 (枚举 TradeOrderTypeEnum)
      */
@@ -112,14 +105,7 @@ public class TradeOrderDO extends BaseDO {
      * 实收金额（总），单位：分
      */
     private Integer livePrice;
-    /**
+
-     * 预约类型（1预约 2 加急）
-     */
-    private Boolean subType;
-    /**
-     * 预约时间
-     */
-    private LocalDateTime subTime;
     /**
      * 支付订单编号
      */

tashow-module/tashow-module-trade/src/main/java/com/tashow/cloud/trade/dal/dataobject/order/TradeOrderItemDO.java

@@ -60,6 +60,22 @@ public class TradeOrderItemDO extends BaseDO {
      * 商品 SKU 名称
      */
     private String skuName;
+    /**
+     * 店铺id
+     */
+    private Long shopId;
+    /**
+     * 店铺名称
+     */
+    private String shopName;
+    /**
+     * 订单类目id
+     */
+    private Long orderCategoryId;
+    /**
+     * 订单类目名称
+     */
+    private String orderCategoryName;
     /**
      * 商品图片
      */
@@ -100,11 +116,36 @@ public class TradeOrderItemDO extends BaseDO {
      * 实收金额（总），单位：分
      */
     private Integer livePrice;
+    /**
+     * 退款金额（总），单位：分
+     */
+    private Integer refundPrice;
+    /**
+     * 退款状态
+     */
+    private Integer refundStatus;
+    /**
+     * 退款时间
+     */
+    private LocalDateTime refundTime;
+    /**
+     * 预约类型（1预约 2 加急）
+     */
+    private Boolean subType;
+    /**
+     * 预约时间
+     */
+    private LocalDateTime subTime;
 
     /**
      * 服务地址
      */
-    private LocalDateTime serveAddress;
+    private String serveAddress;
+
+    /**
+     * 服务内容
+     */
+    private String serveContent;
     /**
      * 属性数组
      */

tashow-module/tashow-module-trade/src/main/java/com/tashow/cloud/trade/dal/dataobject/order/TradeOrderLogDO.java

@@ -1,6 +1,5 @@
 package com.tashow.cloud.trade.dal.dataobject.order;
 
-import com.baomidou.mybatisplus.annotation.KeySequence;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.tashow.cloud.common.enums.UserTypeEnum;
@@ -13,7 +12,7 @@ import lombok.*;
  *
  * @author 陈賝
  */
-@TableName("trade_order_log")
+@TableName("tz_trade_order_log")
 @Data
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)

tashow-module/tashow-module-trade/src/main/java/com/tashow/cloud/trade/dal/mysql/order/TradeOrderMapper.java

@@ -32,12 +32,9 @@ public interface TradeOrderMapper extends BaseMapperX<TradeOrderDO> {
     default PageResult<TradeOrderDO> selectPage(TradeOrderPageReqVO reqVO, Set<Long> userIds) {
         return selectPage(reqVO, new LambdaQueryWrapperX<TradeOrderDO>()
                 .likeIfPresent(TradeOrderDO::getMerchantName, reqVO.getMerchantName())
-                .eqIfPresent(TradeOrderDO::getOrderCategoryId, reqVO.getOrderCategoryId())
                 .eqIfPresent(TradeOrderDO::getOrderTerminal, reqVO.getOrderTerminal())
                 .eqIfPresent(TradeOrderDO::getFinanceStatus, reqVO.getFinanceStatus())
                 .eqIfPresent(TradeOrderDO::getAfterSaleStatus, reqVO.getAfterSaleStatus())
-                .eqIfPresent(TradeOrderDO::getSubType, reqVO.getSubType())
-                .betweenIfPresent(TradeOrderDO::getSubTime, reqVO.getSubTime())
                 .betweenIfPresent(TradeOrderDO::getCreateTime, reqVO.getCreateTime())
                 .and(StrUtil.isNotBlank(reqVO.getProdSearch()),
                         qw->qw.like(TradeOrderDO::getOrderNum, reqVO.getProdSearch())
@@ -49,15 +46,13 @@ public interface TradeOrderMapper extends BaseMapperX<TradeOrderDO> {
                 .orderByDesc(TradeOrderDO::getId));
     }
 
-    // TODO @疯狂：如果用 map 返回，要不这里直接用 TradeOrderSummaryRespVO 返回？也算合理，就当  sql 查询出这么个玩意~~
+    default List<Map<String, Object>> selectOrderSummary() {
-    default List<Map<String, Object>> selectOrderSummaryGroupByRefundStatus(TradeOrderPageReqVO reqVO, Set<Long> userIds) {
         return selectMaps(new MPJLambdaWrapperX<TradeOrderDO>()
-                .selectAs(TradeOrderDO::getRefundStatus, TradeOrderDO::getRefundStatus)  // 售后状态
+                .selectCount(TradeOrderDO::getId, "count")
-                .selectCount(TradeOrderDO::getId, "count") // 售后状态对应的数量
+                .selectSum(TradeOrderDO::getPayPrice, "payPrice")
-                .selectSum(TradeOrderDO::getPayPrice, "price")  // 售后状态对应的支付金额
+                .selectSum(TradeOrderDO::getLivePrice, "livePrice")
-                .inIfPresent(TradeOrderDO::getUserId, userIds)
+                .groupBy(TradeOrderDO::getId)
-                .betweenIfPresent(TradeOrderDO::getCreateTime, reqVO.getCreateTime())
+        );
-                .groupBy(TradeOrderDO::getRefundStatus)); // 按售后状态分组
     }
 
     default PageResult<TradeOrderDO> selectPage(AppTradeOrderPageReqVO reqVO, Long userId) {

tashow-module/tashow-module-trade/src/main/java/com/tashow/cloud/trade/framework/order/core/utils/TransOrderByTempUtils.java

@@ -0,0 +1,176 @@
+package com.tashow.cloud.trade.framework.order.core.utils;
+
+import cn.hutool.core.io.resource.ResourceUtil;
+import cn.hutool.core.map.MapUtil;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.tashow.cloud.common.util.json.JsonUtils;
+import com.tashow.cloud.trade.dal.dataobject.order.TradeOrderItemDO;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+public class TransOrderByTempUtils {
+
+    private final static String tempUrl = "temp/order_serve_info.json";
+
+
+    public static JSONObject trans(TradeOrderItemDO item) {
+        JSONObject result = new JSONObject();
+        String json = ResourceUtil.readUtf8Str(tempUrl);
+        //解析json
+        JSONObject orderInfo = JSON.parseObject(json);
+        JSONArray serveInfoTempObj = orderInfo.getJSONArray("serveInfo");
+        JSONArray serveExtInfoTempObj = orderInfo.getJSONArray("selectedServeInfo");
+        JSONArray priceExtInfoTempObj = orderInfo.getJSONArray("priceExtInfo");
+        //获取服务信息
+        result.put("serveInfo", getServeInfo(serveInfoTempObj, item.getServeInfo()));
+        //可选服务
+        result.put("selectedServeInfo", getServeInfo(serveExtInfoTempObj, item.getServeExtInfo()));
+        //服务附加费
+        result.put("priceExtInfo", getServeInfo(priceExtInfoTempObj, item.getPriceExtInfo()));
+        return result;
+    }
+
+    private static List<List<JSONObject>> getServeInfo(JSONArray tempObj, String valueInfo) {
+        List<List<JSONObject>> result = new ArrayList<>();
+        //数据json  [{},{}]
+        JSONArray valueInfoObj = JSON.parseArray(valueInfo);
+        for (Object val : valueInfoObj) {
+            List<JSONObject> valResult = new ArrayList<>();
+            Map valMap = JsonUtils.parseObject(val.toString(), Map.class);
+            if (valMap == null) {
+                continue;
+            }
+            //模版json
+            for (Object tem : tempObj) {
+                JSONObject resultMap = new JSONObject();
+                Map<String, Object> tempMap = JsonUtils.parseObject(tem.toString(), Map.class);
+                resultMap.put("key", MapUtil.getStr(tempMap, "key"));
+                resultMap.put("name", MapUtil.getStr(tempMap, "name"));
+                resultMap.put("value", valMap.get(MapUtil.getStr(tempMap, "key")));
+                resultMap.put("sort", MapUtil.getStr(tempMap, "sort"));
+                valResult.add(resultMap);
+            }
+            result.add(valResult);
+        }
+        return result;
+    }
+
+    public static void main(String[] args) {
+        TradeOrderItemDO itemDO = new TradeOrderItemDO();
+        JSONArray tempObj = new JSONArray();
+        JSONObject orderInfo = new JSONObject();
+        orderInfo.put("petName", "aaa");
+        orderInfo.put("petType", "aaa");
+        orderInfo.put("weight", "aaa");
+        orderInfo.put("diedTime", "aaa");
+        orderInfo.put("diedReason", "aaa");
+        orderInfo.put("remainsPhoneUrl", "aaa");
+        orderInfo.put("subType", "aaa");
+        orderInfo.put("changeRule", "aaa");
+        orderInfo.put("subOrder", "aaa");
+        orderInfo.put("userRemark", "aaa");
+        orderInfo.put("merchantRemark", "aaa");
+        orderInfo.put("pickUpAddress", "aaa");
+        orderInfo.put("sendAddress", "aaa");
+        tempObj.add(orderInfo);
+        orderInfo = new JSONObject();
+        orderInfo.put("petName", "bbb");
+        orderInfo.put("petType", "bbb");
+        orderInfo.put("weight", "bbb");
+        orderInfo.put("diedTime", "bbb");
+        orderInfo.put("diedReason", "bbb");
+        orderInfo.put("remainsPhoneUrl", "bbb");
+        orderInfo.put("subType", "bbb");
+        orderInfo.put("changeRule", "bbb");
+        orderInfo.put("subOrder", "bbb");
+        orderInfo.put("userRemark", "bbb");
+        orderInfo.put("merchantRemark", "bbb");
+        orderInfo.put("pickUpAddress", "bbb");
+        orderInfo.put("sendAddress", "bbb");
+        tempObj.add(orderInfo);
+        String jsonString = JSON.toJSONString(tempObj);
+        System.out.println("serveInfo:" + jsonString);
+        itemDO.setServeInfo(jsonString);
+        JSONArray tempObj1 = new JSONArray();
+        JSONObject extraInfo = new JSONObject();
+        extraInfo.put("serveUrl", "aaa");
+        extraInfo.put("serveName", "aaa");
+        extraInfo.put("serveDesc", "aaa");
+        extraInfo.put("prodType", "aaa");
+        extraInfo.put("parentActive", "aaa");
+        extraInfo.put("count", "aaa");
+        extraInfo.put("price", "aaa");
+        extraInfo.put("handPrice", "aaa");
+        extraInfo.put("totalPrice", "aaa");
+        extraInfo.put("discountPrice", "aaa");
+        extraInfo.put("payPrice", "aaa");
+        extraInfo.put("refundMoney", "aaa");
+        extraInfo.put("refundCount", "aaa");
+        extraInfo.put("deliveryType", "aaa");
+        extraInfo.put("receiptUser", "aaa");
+        extraInfo.put("userMobile", "aaa");
+        extraInfo.put("receiveAddress", "aaa");
+        tempObj1.add(extraInfo);
+        extraInfo = new JSONObject();
+        extraInfo.put("serveUrl", "bbb");
+        extraInfo.put("serveName", "bbb");
+        extraInfo.put("serveDesc", "bbb");
+        extraInfo.put("prodType", "bbb");
+        extraInfo.put("parentActive", "bbb");
+        extraInfo.put("count", "bbb");
+        extraInfo.put("price", "bbb");
+        extraInfo.put("handPrice", "bbb");
+        extraInfo.put("totalPrice", "bbb");
+        extraInfo.put("discountPrice", "bbb");
+        extraInfo.put("payPrice", "bbb");
+        extraInfo.put("refundMoney", "bbb");
+        extraInfo.put("refundCount", "bbb");
+        extraInfo.put("deliveryType", "bbb");
+        extraInfo.put("receiptUser", "bbb");
+        extraInfo.put("userMobile", "bbb");
+        extraInfo.put("receiveAddress", "bbb");
+        tempObj1.add(extraInfo);
+        String jsonString1 = JSON.toJSONString(tempObj1);
+        System.out.println("selected:" + jsonString1);
+        itemDO.setServeExtInfo(jsonString1);
+        JSONArray priceExtObj = new JSONArray();
+        JSONObject priceExtInfo = new JSONObject();
+        priceExtInfo.put("costName", "aaa");
+        priceExtInfo.put("serveArea", "aaa");
+        priceExtInfo.put("targetArea", "aaa");
+        priceExtInfo.put("chargeType", "aaa");
+        priceExtInfo.put("respMode", "aaa");
+        priceExtInfo.put("respTime", "aaa");
+        priceExtInfo.put("weight", "aaa");
+        priceExtInfo.put("chargeTime", "aaa");
+        priceExtInfo.put("totalPrice", "aaa");
+        priceExtInfo.put("discountPrice", "aaa");
+        priceExtInfo.put("payPrice", "aaa");
+        priceExtInfo.put("refundPrice", "aaa");
+        priceExtObj.add(priceExtInfo);
+        priceExtInfo = new JSONObject();
+        priceExtInfo.put("costName", "bbb");
+        priceExtInfo.put("serveArea", "bbb");
+        priceExtInfo.put("targetArea", "bbb");
+        priceExtInfo.put("chargeType", "bbb");
+        priceExtInfo.put("respMode", "bbb");
+        priceExtInfo.put("respTime", "bbb");
+        priceExtInfo.put("weight", "bbb");
+        priceExtInfo.put("chargeTime", "bbb");
+        priceExtInfo.put("totalPrice", "bbb");
+        priceExtInfo.put("discountPrice", "bbb");
+        priceExtInfo.put("payPrice", "bbb");
+        priceExtInfo.put("refundPrice", "bbb");
+        priceExtObj.add(priceExtInfo);
+        String jsonString2 = JSON.toJSONString(priceExtObj);
+        System.out.println("price:" + jsonString2);
+        itemDO.setPriceExtInfo(jsonString2);
+        Map<String, Object> trans = trans(itemDO);
+        System.out.println(JSON.toJSONString(trans));
+    }
+
+}

tashow-module/tashow-module-trade/src/main/java/com/tashow/cloud/trade/service/order/TradeOrderQueryService.java

@@ -70,10 +70,9 @@ public interface TradeOrderQueryService {
     /**
      * 获得订单统计
      *
-     * @param reqVO 请求参数
      * @return 订单统计
      */
-    TradeOrderSummaryRespVO getOrderSummary(TradeOrderPageReqVO reqVO);
+    TradeOrderSummaryRespVO getOrderSummary();
 
     /**
      * 【会员】获得交易订单分页

tashow-module/tashow-module-trade/src/main/java/com/tashow/cloud/trade/service/order/TradeOrderQueryServiceImpl.java

@@ -1,7 +1,6 @@
 package com.tashow.cloud.trade.service.order;
 
 import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.extra.spring.SpringUtil;
 import com.tashow.cloud.common.pojo.PageResult;
@@ -18,7 +17,6 @@ import com.tashow.cloud.trade.framework.delivery.core.client.ExpressClientFactor
 import com.tashow.cloud.trade.framework.delivery.core.client.dto.ExpressTrackQueryReqDTO;
 import com.tashow.cloud.trade.framework.delivery.core.client.dto.ExpressTrackRespDTO;
 import com.tashow.cloud.trade.service.delivery.DeliveryExpressService;
-import com.tashow.cloud.tradeapi.enums.order.TradeOrderRefundStatusEnum;
 import com.tashow.cloud.tradeapi.enums.order.TradeOrderStatusEnum;
 import com.tashow.cloud.tradeapi.enums.order.TradeOrderTypeEnum;
 import jakarta.annotation.Resource;
@@ -118,27 +116,12 @@ public class TradeOrderQueryServiceImpl implements TradeOrderQueryService {
     }
 
     @Override
-    public TradeOrderSummaryRespVO getOrderSummary(TradeOrderPageReqVO reqVO) {
+    public TradeOrderSummaryRespVO getOrderSummary() {
-        // 根据用户查询条件构建用户编号列表
+        List<Map<String, Object>> list = tradeOrderMapper.selectOrderSummary();
-        Set<Long> userIds = buildQueryConditionUserIds(reqVO);
+        return new TradeOrderSummaryRespVO()
-        if (userIds == null) { // 没查询到用户，说明肯定也没他的订单
+                .setOrderCount(list.stream().mapToLong(x -> Long.parseLong(x.get("count").toString())).sum())
-            return new TradeOrderSummaryRespVO();
+                .setLivePrice(list.stream().mapToLong(x -> Long.parseLong(x.get("livePrice").toString())).sum())
-        }
+                .setPayPrice(list.stream().mapToLong(x -> Long.parseLong(x.get("payPrice").toString())).sum());
-        // 查询每个售后状态对应的数量、金额
-        List<Map<String, Object>> list = tradeOrderMapper.selectOrderSummaryGroupByRefundStatus(reqVO, userIds);
-
-        TradeOrderSummaryRespVO vo = new TradeOrderSummaryRespVO().setAfterSaleCount(0L).setAfterSalePrice(0L);
-        for (Map<String, Object> map : list) {
-            Long count = MapUtil.getLong(map, "count", 0L);
-            Long price = MapUtil.getLong(map, "price", 0L);
-            // 未退款的计入订单，部分退款、全部退款计入售后
-            if (TradeOrderRefundStatusEnum.NONE.getStatus().equals(MapUtil.getInt(map, "refundStatus"))) {
-                vo.setOrderCount(count).setOrderPayPrice(price);
-            } else {
-                vo.setAfterSaleCount(vo.getAfterSaleCount() + count).setAfterSalePrice(vo.getAfterSalePrice() + price);
-            }
-        }
-        return vo;
     }
 
     @Override

tashow-module/tashow-module-trade/src/main/java/com/tashow/cloud/trade/service/order/TradeOrderUpdateServiceImpl.java

@@ -268,19 +268,19 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService {
         PayOrderRespDTO payOrder = validatePayOrderPaid(order, payOrderId);
 
         // 3. 更新 TradeOrderDO 状态为已支付，等待发货
-        int updateCount = tradeOrderMapper.updateByIdAndStatus(id, order.getOrderStatus(),
+//        int updateCount = tradeOrderMapper.updateByIdAndStatus(id, order.getOrderStatus(),
-                new TradeOrderDO().setOrderStatus(TradeOrderStatusEnum.UNDELIVERED.getStatus()).setPayStatus(true)
+//                new TradeOrderDO().setOrderStatus(TradeOrderStatusEnum.UNDELIVERED.getStatus()).setPayStatus(true)
-                        .setPayTime(LocalDateTime.now()).setPayChannelCode(1));
+//                        .setPayTime(LocalDateTime.now()).setPayChannelCode(1));
-        if (updateCount == 0) {
+//        if (updateCount == 0) {
-            throw exception(ORDER_UPDATE_PAID_STATUS_NOT_UNPAID);
+//            throw exception(ORDER_UPDATE_PAID_STATUS_NOT_UNPAID);
-        }
+//        }
 
         // 4. 执行 TradeOrderHandler 的后置处理
         List<TradeOrderItemDO> orderItems = tradeOrderItemMapper.selectListByOrderId(id);
         tradeOrderHandlers.forEach(handler -> handler.afterPayOrder(order, orderItems));
 
         // 5. 记录订单日志
-        TradeOrderLogUtils.setOrderInfo(order.getId(), order.getOrderStatus(), TradeOrderStatusEnum.UNDELIVERED.getStatus());
+//        TradeOrderLogUtils.setOrderInfo(order.getId(), order.getOrderStatus(), TradeOrderStatusEnum.UNDELIVERED.getStatus());
         TradeOrderLogUtils.setUserInfo(order.getUserId(), UserTypeEnum.MEMBER.getValue());
     }
 
@@ -516,9 +516,9 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService {
             throw exception(ORDER_NOT_FOUND);
         }
         // 1.2 校验状态
-        if (ObjectUtil.notEqual(order.getOrderStatus(), TradeOrderStatusEnum.UNPAID.getStatus())) {
+//        if (ObjectUtil.notEqual(order.getOrderStatus(), TradeOrderStatusEnum.UNPAID.getStatus())) {
-            throw exception(ORDER_CANCEL_FAIL_STATUS_NOT_UNPAID);
+//            throw exception(ORDER_CANCEL_FAIL_STATUS_NOT_UNPAID);
-        }
+//        }
 
         // 2. 取消订单
         cancelOrder0(order, TradeOrderCancelTypeEnum.MEMBER_CANCEL);
@@ -529,7 +529,7 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService {
         // 1. 查询过期的待支付订单
         LocalDateTime expireTime = minusTime(tradeOrderProperties.getPayExpireTime());
         List<TradeOrderDO> orders = tradeOrderMapper.selectListByStatusAndCreateTimeLt(
-                TradeOrderStatusEnum.UNPAID.getStatus(), expireTime);
+                TradeOrderStatusEnum.WAITPAID.getStatus(), expireTime);
         if (CollUtil.isEmpty(orders)) {
             return 0;
         }

tashow-module/tashow-module-trade/src/main/resources/temp/order_serve_info.json

@@ -0,0 +1,184 @@
+{
+  "serveInfo": {
+    "boneInfo": {
+      "petName": "aaa",
+      "petType": "aaa",
+      "weight": "aaa",
+      "diedTime": "aaa",
+      "diedReason": "aaa",
+      "boneUrl": [
+        "aaa",
+        "bbb"
+      ]
+    },
+    "subInfo": {
+      "subType": "bbbb",
+      "changeRule": "bbbb",
+      "subOrder": "bbbb",
+      "userRemark": "bbbb",
+      "merchantRemark": "bbbb",
+      "pickUpAddress": "bbbb",
+      "sendAddress": "bbbb"
+    }
+  },
+  "selectedServeInfo": [
+    [
+      {
+        "tempType": 1,
+        "serve": [
+          {
+            "serveUrl": "ccc",
+            "serveName": "ccc",
+            "serveDesc": "ccc",
+            "count": "ccc",
+            "price": "ccc",
+            "handPrice": "ccc"
+          }
+        ],
+        "totalPrice": "ccc",
+        "discountPrice": "ccc",
+        "payPrice": "ccc",
+        "refundMoney": "ccc",
+        "refundCount": "ccc"
+      },
+      {
+        "tempType": 2,
+        "serve": [
+          {
+            "serveUrl": "ccc",
+            "serveName": "ccc",
+            "serveDesc": "ccc",
+            "count": "ccc",
+            "price": "ccc",
+            "handPrice": "ccc",
+            "parentActive": "ccc",
+            "riteAddress": "ccc"
+          }
+        ],
+        "totalPrice": "ccc",
+        "discountPrice": "ccc",
+        "payPrice": "ccc",
+        "refundMoney": "ccc",
+        "refundCount": "ccc"
+      }
+    ],
+    [
+      {
+        "tempType": 3,
+        "serveTitle": "骨灰处理",
+        "serveType": "处理方式",
+        "serve": [
+          {
+            "serveUrl": "ccc",
+            "serveName": "ccc",
+            "serveDesc": "ccc",
+            "count": "ccc",
+            "price": "ccc",
+            "handPrice": "ccc"
+          },
+          {
+            "serveUrl": "ccc",
+            "serveName": "ccc",
+            "serveDesc": "ccc",
+            "count": "ccc",
+            "price": "ccc",
+            "handPrice": "ccc"
+          }
+        ],
+        "totalPrice": "ccc",
+        "discountPrice": "ccc",
+        "payPrice": "ccc",
+        "refundMoney": "ccc",
+        "refundCount": "ccc"
+      },
+      {
+        "deliveryType": "配送方式",
+        "receiveUser": "收货人",
+        "sendUser": "提货人",
+        "userMobile": "手机号码",
+        "address": "收货地址"
+      }
+    ],
+    [
+      {
+        "tempType": 4,
+        "serve": [
+          {
+            "prodUrl": "ccc",
+            "prodName": "ccc",
+            "prodDesc": "ccc",
+            "prodType": "ccc",
+            "parentActivity": "ccc",
+            "count": "ccc",
+            "price": "ccc",
+            "handPrice": "ccc"
+          }
+        ],
+        "totalPrice": "ccc",
+        "discountPrice": "ccc",
+        "payPrice": "ccc",
+        "refundMoney": "ccc",
+        "refundCount": "ccc"
+      },
+      {
+        "deliveryType": "配送方式",
+        "receiveUser": "收货人",
+        "sendUser": "提货人",
+        "userMobile": "手机号码",
+        "address": "收货地址"
+      }
+    ]
+  ],
+  "priceExtInfo": [
+    {
+      "serveExtFee": "",
+      "costName": "超区域服务费",
+      "serveArea": "可服务区域",
+      "targetArea": "目标区域",
+      "chargeType": "收费方式",
+      "payInfo": {
+        "totalPrice": "11",
+        "discountPrice": "222",
+        "payPrice": "333"
+      },
+      "refundPrice": "11"
+    },
+    {
+      "serveExtFee": "",
+      "respMode": "响应模式",
+      "respTime": "响应时间",
+      "chargeType": "收费方式",
+      "payInfo": {
+        "totalPrice": "11",
+        "discountPrice": "222",
+        "payPrice": "333"
+      },
+      "refundPrice": "11"
+    },
+    {
+      "serveExtFee": "",
+      "costName": "超区域服务费",
+      "weight": "体型/体重",
+      "chargeType": "收费方式",
+      "payInfo": {
+        "totalPrice": "11",
+        "discountPrice": "222",
+        "payPrice": "333"
+      },
+      "refundPrice": "11"
+    },
+    {
+      "serveExtFee": "",
+      "costName": "超区域服务费",
+      "chargeTime": "收费时段",
+      "chargeType": "收费方式",
+      "payInfo": {
+        "totalPrice": "11",
+        "discountPrice": "222",
+        "payPrice": "333"
+      },
+      "refundPrice": "11"
+    }
+  ]
+}
+