diff --git a/CatmDogd-Mall-Front-test/src/components/CheckinDialog.vue b/CatmDogd-Mall-Front-test/src/components/CheckinDialog.vue index 1c4f0fc..d2d3bf7 100644 --- a/CatmDogd-Mall-Front-test/src/components/CheckinDialog.vue +++ b/CatmDogd-Mall-Front-test/src/components/CheckinDialog.vue @@ -275,22 +275,22 @@ export default { // 处理数据格式，将接口返回的字段映射到组件需要的格式 this.checkinData = { // 手套照片 - 单个字符串转为数组 - gloveImages: data.glovePhoto ? [data.glovePhoto] : [], + gloveImages: data.glovePhoto ? data.glovePhoto.split(',') : [], // 鞋套照片 - 单个字符串转为数组 - shoeImages: data.shoeCoverPhoto ? [data.shoeCoverPhoto] : [], + shoeImages: data.shoeCoverPhoto ? data.shoeCoverPhoto.split(',') : [], // 粮碗前后对比（原梳毛前后对比） - groomingBeforeImages: data.grainBowlFront ? [data.grainBowlFront] : [], - groomingAfterImages: data.grainBowlAfter ? [data.grainBowlAfter] : [], + groomingBeforeImages: data.grainBowlFront ? data.grainBowlFront.split(',') : [], + groomingAfterImages: data.grainBowlAfter ? data.grainBowlAfter.split(',') : [], // 水碗前后对比 - waterBowlBeforeImages: data.waterBowlFront ? [data.waterBowlFront] : [], - waterBowlAfterImages: data.waterBowlAfter ? [data.waterBowlAfter] : [], + waterBowlBeforeImages: data.waterBowlFront ? data.waterBowlFront.split(',') : [], + waterBowlAfterImages: data.waterBowlAfter ? data.waterBowlAfter.split(',') : [], // 猫砂盆/尿垫前后对比（原洗澡盆前后对比） - basinBeforeImages: data.basinFront ? [data.basinFront] : [], - basinAfterImages: data.basinAfter ? [data.basinAfter] : [], + basinBeforeImages: data.basinFront ? data.basinFront.split(',') : [], + basinAfterImages: data.basinAfter ? data.basinAfter.split(',') : [], // 宠物列表 petList: this.parsePetList(data.petPhoto), diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletOrderController.java b/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletOrderController.java index dc03453..11b3df5 100644 --- a/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletOrderController.java +++ b/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletOrderController.java @@ -179,9 +179,7 @@ public class ApiAppletOrderController extends BaseController { .select(AppletOutDate::getDate) .eq(AppletOutDate::getAddressId, appletAddress.getId()) .list().stream() - .map(n -> { - return sdf.format(n.getDate()); - }) + .map(n -> sdf.format(n.getDate())) .collect(Collectors.toList()); diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiMallOrderController.java b/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiMallOrderController.java index 8bc9982..ed48dd3 100644 --- a/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiMallOrderController.java +++ b/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiMallOrderController.java @@ -68,7 +68,6 @@ public class ApiMallOrderController extends BaseController { statusList.add(1); statusList.add(2); statusList.add(3); - } else { statusList.add(status); } diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/applet/service/impl/IApiMallOrderServiceImpl.java b/ruoyi-catdog/src/main/java/com/ruoyi/applet/service/impl/IApiMallOrderServiceImpl.java index 03d7857..a499047 100644 --- a/ruoyi-catdog/src/main/java/com/ruoyi/applet/service/impl/IApiMallOrderServiceImpl.java +++ b/ruoyi-catdog/src/main/java/com/ruoyi/applet/service/impl/IApiMallOrderServiceImpl.java @@ -3,6 +3,7 @@ package com.ruoyi.applet.service.impl; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.cyl.h5.pojo.request.CancelOrderRequest; import com.cyl.h5.pojo.request.OrderPayRequest; import com.cyl.h5.pojo.response.OrderPayResponse; @@ -38,8 +39,10 @@ import com.ruoyi.applet.service.IApiMallOrderService; import com.ruoyi.common.constant.Constants; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.redis.RedisService; +import com.ruoyi.common.utils.spring.SpringUtils; import com.ruoyi.framework.config.LocalDataUtil; import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.data.domain.PageImpl; @@ -139,9 +142,15 @@ public class IApiMallOrderServiceImpl implements IApiMallOrderService { List orderList = orderMapper.orderPage3(status, memberWechat.getMemberId()); - - - +// List orderList = orderMapper.selectList(Wrappers.lambdaQuery() +// .in(Order::getStatus, status) +// .orderByDesc(Order::getCreateTime)) +// .stream().map(n -> { +// H5OrderVO h5OrderVO = new H5OrderVO(); +// BeanUtils.copyProperties(n, h5OrderVO); +// h5OrderVO.setOrderId(n.getId()); +// return h5OrderVO; +// }).collect(Collectors.toList()); long total = ((com.github.pagehelper.Page) orderList).getTotal(); diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/model/domain/AppletOrder.java b/ruoyi-catdog/src/main/java/com/ruoyi/model/domain/AppletOrder.java index 375dd0d..84b04b8 100644 --- a/ruoyi-catdog/src/main/java/com/ruoyi/model/domain/AppletOrder.java +++ b/ruoyi-catdog/src/main/java/com/ruoyi/model/domain/AppletOrder.java @@ -46,7 +46,7 @@ public class AppletOrder { private LocalDateTime payTime; /** 订单状态 */ - @Excel(name = "订单状态 好像是接单状态") + @Excel(name = "订单状态 好像是接单状态 0待接单 1已接单") private Integer status; /** 派单次数 */ diff --git a/ruoyi-mall/src/main/resources/mapper/oms/OrderMapper.xml b/ruoyi-mall/src/main/resources/mapper/oms/OrderMapper.xml index 76d8c5c..b76b9c7 100644 --- a/ruoyi-mall/src/main/resources/mapper/oms/OrderMapper.xml +++ b/ruoyi-mall/src/main/resources/mapper/oms/OrderMapper.xml @@ -285,10 +285,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" delete_status=0 and member_id=#{memberId} - and status in (0,1,2,3,4) - - - + and status in +-- (0,1,2,3,4) + + #{item} + order by create_time desc