From fefa68e08d3d2e97f57a583c5df5883231641f75 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 25 Jun 2021 18:26:39 +0800
Subject: [PATCH] Merge branch 'score-shop' of http://120.27.238.55:7000/r/xzx into score-shop
---
gc-shop/src/main/resources/mapper/shop/JhyOrderMapper.xml | 47 +++++++++++++++
gc-shop/src/main/java/com/xzx/gc/shop/mapper/JhyOrderItemsMapper.java | 7 ++
gc-shop/src/main/java/com/xzx/gc/shop/service/JhyService.java | 16 +++++
gc-shop/src/main/java/com/xzx/gc/shop/mapper/JhyOrderMapper.java | 2
gc-shop/src/main/resources/mapper/shop/JhyOrderItemsMapper.xml | 6 ++
gc-shop/src/main/java/com/xzx/gc/shop/vo/ViewJhyOrderVo.java | 86 ++++++++++++++++------------
gc-shop/src/main/java/com/xzx/gc/shop/vo/QueryJhyOrderListVo.java | 2
gc-shop/src/main/java/com/xzx/gc/shop/service/GoodsService.java | 4 +
8 files changed, 131 insertions(+), 39 deletions(-)
diff --git a/gc-shop/src/main/java/com/xzx/gc/shop/mapper/JhyOrderItemsMapper.java b/gc-shop/src/main/java/com/xzx/gc/shop/mapper/JhyOrderItemsMapper.java
new file mode 100644
index 0000000..4013dbe
--- /dev/null
+++ b/gc-shop/src/main/java/com/xzx/gc/shop/mapper/JhyOrderItemsMapper.java
@@ -0,0 +1,7 @@
+package com.xzx.gc.shop.mapper;
+
+import com.xzx.gc.entity.JhyOrderItems;
+import com.xzx.gc.util.GcMapper;
+
+public interface JhyOrderItemsMapper extends GcMapper<JhyOrderItems> {
+}
diff --git a/gc-shop/src/main/java/com/xzx/gc/shop/mapper/JhyOrderMapper.java b/gc-shop/src/main/java/com/xzx/gc/shop/mapper/JhyOrderMapper.java
index 583c091..7140ea6 100644
--- a/gc-shop/src/main/java/com/xzx/gc/shop/mapper/JhyOrderMapper.java
+++ b/gc-shop/src/main/java/com/xzx/gc/shop/mapper/JhyOrderMapper.java
@@ -3,6 +3,7 @@
import com.xzx.gc.entity.JhyOrder;
import com.xzx.gc.shop.dto.QueryJhyOrderListDto;
import com.xzx.gc.shop.vo.QueryJhyOrderListVo;
+import com.xzx.gc.shop.vo.ViewJhyOrderVo;
import com.xzx.gc.util.GcMapper;
import org.apache.ibatis.annotations.Param;
@@ -12,4 +13,5 @@
List<QueryJhyOrderListVo> queryOrderList(@Param("record") QueryJhyOrderListDto model);
+ ViewJhyOrderVo viewJhyOrder(@Param("id")Long id);
}
diff --git a/gc-shop/src/main/java/com/xzx/gc/shop/service/GoodsService.java b/gc-shop/src/main/java/com/xzx/gc/shop/service/GoodsService.java
index 1942e9b..a62e841 100644
--- a/gc-shop/src/main/java/com/xzx/gc/shop/service/GoodsService.java
+++ b/gc-shop/src/main/java/com/xzx/gc/shop/service/GoodsService.java
@@ -251,6 +251,8 @@
if(CollUtil.isNotEmpty(scoreGoodsSkuDtos)){
for(ScoreGoodsSkuDto scoreGoodsSkuDto : scoreGoodsSkuDtos){
ScoreGoodsSku scoreGoodsSku = objectMapper.convertValue(scoreGoodsSkuDto, ScoreGoodsSku.class);
+ scoreGoodsSku.setGoodsId(scoreGoodsStyleDto.getId());
+ scoreGoodsSku.setStyleId(scoreGoodsStyle.getId());
scoreGoodsSkuMapper.insertSelective(scoreGoodsSku);
}
}
@@ -282,6 +284,8 @@
}else{
ScoreGoods scoreGoods = new ScoreGoods();
scoreGoods.setIsQg(ScoreGoods.ISQG_NO);
+ scoreGoods.setQgEndTime(null);
+ scoreGoods.setQgStartTime(null);
Example exampleGoods = new Example(ScoreGoods.class);
Example.Criteria criteriaGoods = exampleGoods.createCriteria();
criteriaGoods.andEqualTo("id",id);
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
index 755497d..86988aa 100644
--- 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
@@ -5,7 +5,10 @@
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.xzx.gc.common.utils.StringUtils;
+import com.xzx.gc.entity.JhyOrderItems;
+import com.xzx.gc.entity.ScoreOrderDetails;
import com.xzx.gc.shop.dto.QueryJhyOrderListDto;
+import com.xzx.gc.shop.mapper.JhyOrderItemsMapper;
import com.xzx.gc.shop.mapper.JhyOrderMapper;
import com.xzx.gc.shop.vo.QueryGoodsListVo;
import com.xzx.gc.shop.vo.QueryJhyOrderListVo;
@@ -14,6 +17,7 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import tk.mybatis.mapper.entity.Example;
import javax.annotation.Resource;
import java.util.HashMap;
@@ -27,6 +31,8 @@
@Resource
JhyOrderMapper jhyOrderMapper;
+ @Resource
+ JhyOrderItemsMapper jhyOrderItemsMapper;
public Map<String, Object> queryOrderList(QueryJhyOrderListDto model) {
PageHelper.startPage(model.getPage(), model.getLimit());
@@ -48,6 +54,16 @@
public ViewJhyOrderVo viewJhyOrder(Long id) {
ViewJhyOrderVo viewJhyOrderVo = new ViewJhyOrderVo();
+ viewJhyOrderVo = jhyOrderMapper.viewJhyOrder(id);
+
+ String decode = StringUtils.decode(viewJhyOrderVo.getNickName());
+ viewJhyOrderVo.setNickName(decode);
+
+ Example exampleItems = new Example(JhyOrderItems.class);
+ Example.Criteria criteriaItems = exampleItems.createCriteria();
+ criteriaItems.andEqualTo("orderId",id);
+ List<JhyOrderItems> jhyOrderItemsList = jhyOrderItemsMapper.selectByExample(exampleItems);
+ viewJhyOrderVo.setJhyOrderItems(jhyOrderItemsList);
return viewJhyOrderVo;
}
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
index ae1f281..b9c1aeb 100644
--- 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
@@ -21,6 +21,8 @@
private String area;
@ApiModelProperty(value="详细地址")
private String address;
+ @ApiModelProperty(value="预约年月日")
+ private String reserveDate;
@ApiModelProperty(value="预约时间")
private String reserveTime;
@ApiModelProperty(value="订单总金额")
diff --git a/gc-shop/src/main/java/com/xzx/gc/shop/vo/ViewJhyOrderVo.java b/gc-shop/src/main/java/com/xzx/gc/shop/vo/ViewJhyOrderVo.java
index 0dffef9..c0d4796 100644
--- a/gc-shop/src/main/java/com/xzx/gc/shop/vo/ViewJhyOrderVo.java
+++ b/gc-shop/src/main/java/com/xzx/gc/shop/vo/ViewJhyOrderVo.java
@@ -1,49 +1,59 @@
package com.xzx.gc.shop.vo;
+import com.xzx.gc.entity.JhyOrderItems;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+
+import java.util.List;
@Data
@ApiModel(value = "ViewJhyOrderVo", description = "订单")
public class ViewJhyOrderVo {
-// @ApiModelProperty(value="订单编号")
-// private String order_no;
-//
-// @ApiModelProperty(value="收件人")
-// private String nick_name;
-//
-// @ApiModelProperty(value="电话号码")
-// private String mobile_phone;
-//
-// @ApiModelProperty(value="地址")
-// private String areaAddress;
-//
-// @ApiModelProperty(value="预约年月日")
-// private String reserve_date;
-// @ApiModelProperty(value="预约时间")
-// private String reserve_time;
-//
-// @ApiModelProperty(value="订单状态")
-// private String orderNo;
-//
-// @ApiModelProperty(value="集物员")
-// private String orderNo;
-//
-// @ApiModelProperty(value="集物员联系方式")
-// private String orderNo;
-//
-// @ApiModelProperty(value="收货时间")
-// private String orderNo;
-//
-// @ApiModelProperty(value="备注")
-// private String orderNo;
-//
-// @ApiModelProperty(value="评论")
-// private String orderNo;
-// @ApiModelProperty(value="得分 0-0分1-20分2-40分3-60分4-80分5-100分")
-// private String score;
-// @ApiModelProperty(value="是否匿名 1-是2-否")
-// private String is_anonymous;
+ @ApiModelProperty(value="订单编号")
+ private String orderNo;
+
+ @ApiModelProperty(value="收件人")
+ private String nickName;
+
+ @ApiModelProperty(value="电话号码")
+ private String mobilePhone;
+
+ @ApiModelProperty(value="区域")
+ private String area;
+
+ @ApiModelProperty(value="地址")
+ private String Address;
+
+ @ApiModelProperty(value="预约年月日")
+ private String reserveDate;
+
+ @ApiModelProperty(value="预约时间")
+ private String reserveTime;
+
+ @ApiModelProperty(value="状态 1-待接单2-服务中3-已收款4-待入库5-已完成6-已取消")
+ private String status;
+
+ @ApiModelProperty(value="集物员")
+ private String username;
+
+ @ApiModelProperty(value="集物员联系方式")
+ private String mobile;
+
+ @ApiModelProperty(value="收货时间")
+ private String receivingTime;
+
+ @ApiModelProperty(value="备注")
+ private String remark;
+
+ @ApiModelProperty(value="评论")
+ private String comment;
+ @ApiModelProperty(value="得分 0-0分1-20分2-40分3-60分4-80分5-100分")
+ private String score;
+ @ApiModelProperty(value="是否匿名 1-是2-否")
+ private String isAnonymous;
+
+ private List<JhyOrderItems> JhyOrderItems;
+
}
diff --git a/gc-shop/src/main/resources/mapper/shop/JhyOrderItemsMapper.xml b/gc-shop/src/main/resources/mapper/shop/JhyOrderItemsMapper.xml
new file mode 100644
index 0000000..4bd86f6
--- /dev/null
+++ b/gc-shop/src/main/resources/mapper/shop/JhyOrderItemsMapper.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.xzx.gc.shop.mapper.JhyOrderItemsMapper">
+
+
+</mapper>
diff --git a/gc-shop/src/main/resources/mapper/shop/JhyOrderMapper.xml b/gc-shop/src/main/resources/mapper/shop/JhyOrderMapper.xml
index 6c1703a..dc41949 100644
--- a/gc-shop/src/main/resources/mapper/shop/JhyOrderMapper.xml
+++ b/gc-shop/src/main/resources/mapper/shop/JhyOrderMapper.xml
@@ -8,7 +8,7 @@
a.order_no orderNo,
a.area area,
a.address address,
- CONVERT(varchar(100), reserve_date, 23) reserveDate,
+ date_format(reserve_date,'%Y-%m-%d') reserveDate,
a.reserve_time reserveTime,
a.status status,
a.remark remark,
@@ -43,4 +43,49 @@
+ <select id="viewJhyOrder" resultType="com.xzx.gc.shop.vo.ViewJhyOrderVo">
+ SELECT
+ a.id id,
+ a.order_no orderNo,
+ b.nick_name name,
+ b.mobile_phone mobilePhone,
+ a.area area,
+ a.address address,
+ date_format(a.reserve_date,'%Y-%m-%d') reserveDate,
+ a.reserve_time reserveTime,
+ a.status status,
+ d.username username,
+ d.mobile mobile,
+ date_format(a.receiving_time,'%Y-%m-%d %H:%i:%S') receivingTime,
+ a.remark remark,
+ a.comment comment,
+ a.score score,
+ a.is_anonymous isAnonymous
+ FROM
+ xzx_jhy_order a
+ left join xzx_user_info b on b.user_id = a.user_id
+ left join xzx_jhy_info d on d.id = a.jhy_id
+ WHERE 1 = 1
+ <if test="record.orderNo != null and record.orderNo != ''">
+ and a.order_no like concat('%',#{record.orderNo},'%')
+ </if>
+ <if test="record.status != null and record.status != ''">
+ and a.status = #{record.status}
+ </if>
+ <if test="record.account != null and record.account != ''">
+ and ( b.nick_name like concat('%',#{record.account},'%')
+ or b.mobile_phone like concat('%',#{record.account},'%') )
+ </if>
+ <if test="record.reserveTimeStart != null">
+ and a.reserve_time >= #{record.reserveTimeStart}
+ </if>
+
+ <if test="record.reserveTimeEnd != null">
+ and a.reserve_time <= #{record.reserveTimeEnd}
+ </if>
+ order by a.CREATED_TIME desc
+ </select>
+
+
+
</mapper>
--
Gitblit v1.9.1