From 6e686b5f3e261b7c6a0bd95993a3dceceeeea9ab Mon Sep 17 00:00:00 2001 From: xiaoyong931011 <15274802129@163.com> Date: Fri, 25 Jun 2021 15:34:16 +0800 Subject: [PATCH] 20210625 商品分类 --- gc-shop/src/main/java/com/xzx/gc/shop/service/JhyService.java | 17 ++++++++ gc-shop/src/main/java/com/xzx/gc/shop/controller/AdminJhyOrderController.java | 45 ++++++++++++++++++++++ gc-shop/src/main/java/com/xzx/gc/shop/service/OrderService.java | 12 +++-- gc-shop/src/main/java/com/xzx/gc/shop/dto/QueryJhyOrderListDto.java | 28 ++++++++++++++ gc-shop/src/main/java/com/xzx/gc/shop/vo/QueryJhyOrderListVo.java | 9 ++++ gc-shop/src/main/java/com/xzx/gc/shop/vo/ViewOrderVo.java | 2 6 files changed, 107 insertions(+), 6 deletions(-) diff --git a/gc-shop/src/main/java/com/xzx/gc/shop/controller/AdminJhyOrderController.java b/gc-shop/src/main/java/com/xzx/gc/shop/controller/AdminJhyOrderController.java new file mode 100644 index 0000000..1f562f9 --- /dev/null +++ b/gc-shop/src/main/java/com/xzx/gc/shop/controller/AdminJhyOrderController.java @@ -0,0 +1,45 @@ +package com.xzx.gc.shop.controller; + +import com.xzx.gc.common.constant.Constants; +import com.xzx.gc.common.request.BaseController; +import com.xzx.gc.model.JsonResult; +import com.xzx.gc.shop.dto.QueryGoodsListDto; +import com.xzx.gc.shop.dto.QueryJhyOrderListDto; +import com.xzx.gc.shop.service.JhyService; +import com.xzx.gc.shop.vo.QueryGoodsListVo; +import com.xzx.gc.shop.vo.QueryJhyOrderListVo; +import com.xzx.gc.shop.vo.QueryOrderListVo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiResponse; +import io.swagger.annotations.ApiResponses; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; +import java.util.Map; + +@RestController +@Api(tags = {"集物员管理"}) +@Slf4j +public class AdminJhyOrderController extends BaseController { + + @Resource + JhyService jhyService; + + /** + * 订单列表 + * xzx_jhy_order 集货员订单表 + */ + @PostMapping(Constants.ADMIN_VIEW_PREFIX+"/score/jhy/queryOrderList.json") + @ApiResponses({@ApiResponse( code = 200, message = "success", response = QueryJhyOrderListVo.class)}) + @ApiOperation(value = "集物员管理-订单列表", notes = "test: 仅0有正确返回") + public JsonResult<Map<String, Object>> queryOrderList(@RequestBody QueryJhyOrderListDto model) { + Map<String, Object> result = jhyService.queryOrderList(model); + return JsonResult.success(result); + } + + +} diff --git a/gc-shop/src/main/java/com/xzx/gc/shop/dto/QueryJhyOrderListDto.java b/gc-shop/src/main/java/com/xzx/gc/shop/dto/QueryJhyOrderListDto.java new file mode 100644 index 0000000..de124f0 --- /dev/null +++ b/gc-shop/src/main/java/com/xzx/gc/shop/dto/QueryJhyOrderListDto.java @@ -0,0 +1,28 @@ +package com.xzx.gc.shop.dto; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +@Data +public class QueryJhyOrderListDto { + + @ApiModelProperty(value="订单编号") + private String orderNo; + + @ApiModelProperty(value="联系人/手机号") + private String account; + + @ApiModelProperty(value="状态 1-待接单2-服务中3-已收款4-待入库5-已完成6-已取消") + private String status; + + @JsonFormat(shape=JsonFormat.Shape.STRING,pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @ApiModelProperty(value="预约开始时间") + private Date reserveTimeStart; + + @JsonFormat(shape=JsonFormat.Shape.STRING,pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @ApiModelProperty(value="预约结束时间") + private Date reserveTimeEnd; +} diff --git a/gc-shop/src/main/java/com/xzx/gc/shop/service/JhyService.java b/gc-shop/src/main/java/com/xzx/gc/shop/service/JhyService.java new file mode 100644 index 0000000..9ce3f6d --- /dev/null +++ b/gc-shop/src/main/java/com/xzx/gc/shop/service/JhyService.java @@ -0,0 +1,17 @@ +package com.xzx.gc.shop.service; + +import com.xzx.gc.shop.dto.QueryJhyOrderListDto; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Map; + +@Service +@Transactional +@Slf4j +public class JhyService { + public Map<String, Object> queryOrderList(QueryJhyOrderListDto model) { + return null; + } +} diff --git a/gc-shop/src/main/java/com/xzx/gc/shop/service/OrderService.java b/gc-shop/src/main/java/com/xzx/gc/shop/service/OrderService.java index 93eb34e..0705db4 100644 --- a/gc-shop/src/main/java/com/xzx/gc/shop/service/OrderService.java +++ b/gc-shop/src/main/java/com/xzx/gc/shop/service/OrderService.java @@ -3,6 +3,7 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.convert.Convert; import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.ObjectMapper; import com.github.pagehelper.PageHelper; @@ -23,10 +24,7 @@ import tk.mybatis.mapper.entity.Example; import javax.annotation.Resource; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; @Service @Transactional @@ -86,6 +84,10 @@ ObjectMapper objectMapper = new ObjectMapper(); objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); viewOrderVo = objectMapper.convertValue(scoreOrder, ViewOrderVo.class); +// String voucherImg = viewOrderVo.getVoucherImg(); + String voucherImg = scoreOrder.getVoucherImg(); + List<String> lists = StrUtil.split(voucherImg, ","); + viewOrderVo.setVoucherImgs(lists); //2-待收货3-已收货4-已完成5-已评价,获取物流信息 Integer status = scoreOrder.getStatus() == null ? 0:scoreOrder.getStatus(); if(ScoreOrder.STATUS_DOING == status @@ -139,7 +141,7 @@ public Long insureOrder(InsureOrderDto model) { ScoreOrder scoreOrder = new ScoreOrder(); scoreOrder.setId(model.getId()); - scoreOrder.setVoucherImg(model.getVoucherImgs().toString()); + scoreOrder.setVoucherImg(CollUtil.join(model.getVoucherImgs(),",")); scoreOrderMapper.updateByPrimaryKeySelective(scoreOrder); return scoreOrder.getId(); } diff --git a/gc-shop/src/main/java/com/xzx/gc/shop/vo/QueryJhyOrderListVo.java b/gc-shop/src/main/java/com/xzx/gc/shop/vo/QueryJhyOrderListVo.java new file mode 100644 index 0000000..ffc5ad3 --- /dev/null +++ b/gc-shop/src/main/java/com/xzx/gc/shop/vo/QueryJhyOrderListVo.java @@ -0,0 +1,9 @@ +package com.xzx.gc.shop.vo; + +import io.swagger.annotations.ApiModel; +import lombok.Data; + +@Data +@ApiModel(value = "QueryJhyOrderListVo", description = "返回") +public class QueryJhyOrderListVo { +} diff --git a/gc-shop/src/main/java/com/xzx/gc/shop/vo/ViewOrderVo.java b/gc-shop/src/main/java/com/xzx/gc/shop/vo/ViewOrderVo.java index c5f117e..a8555b2 100644 --- a/gc-shop/src/main/java/com/xzx/gc/shop/vo/ViewOrderVo.java +++ b/gc-shop/src/main/java/com/xzx/gc/shop/vo/ViewOrderVo.java @@ -28,7 +28,7 @@ private BigDecimal totalPrice; @ApiModelProperty(value="凭证") - private String voucherImg; + private List<String> voucherImgs; /** * 2-待收货3-已完成4-已取消 -- Gitblit v1.9.1