增加两个时间字段，预约上门时间改为预约时间段

ghy-admin/src/main/java/com/ghy/web/controller/goods/GoodsController.java

@@ -62,7 +62,7 @@ public class GoodsController extends BaseController {
 
     @PostMapping("/hot/list")
     @ResponseBody
-    public TableDataInfo hotList(Goods goods) {
+    public TableDataInfo hotList(@RequestBody Goods goods) {
         DeptGoodsCategory deptGoodsCategory = new DeptGoodsCategory();
         deptGoodsCategory.setDeptId(goods.getDeptId());
         deptGoodsCategory.setIsHot(1);
@@ -76,6 +76,14 @@ public class GoodsController extends BaseController {
         startPage();
         List<Goods> list = goodsService.selectByCategoryIds(ids);
         list.forEach(one -> {
+            // 补全商品图片信息
+            List<GoodsImgs> goodsImgs = goodsImgsService.selectByGoodsId(one.getGoodsId());
+            Map<Integer, List<GoodsImgs>> listMap = new HashMap<>();
+            for (GoodsImgs goodsImg : goodsImgs) {
+                listMap.computeIfAbsent(goodsImg.getImgType(), k -> new ArrayList<>()).add(goodsImg);
+            }
+            one.setGoodsImgsMap(listMap);
+
             // 补全商品
             List<GoodsArea> goodsAreas = goodsAreaService.selectByGoodsId(one.getGoodsId());
             one.setGoodsAreaList(goodsAreas);

ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java

@@ -143,6 +143,8 @@ public class OrderController extends BaseController {
         od.setOrderStatus(OrderStatus.GOING.code());
         od.setWorkerId(request.getWorkerId());
         od.setRevTime(om.getRevTime());
+        od.setExpectTimeStart(om.getExpectTimeStart());
+        od.setExpectTimeEnd(om.getExpectTimeEnd());
         orderDetailService.insertOrderDetail(od);
 
         // 批量生成订单商品
@@ -238,7 +240,9 @@ public class OrderController extends BaseController {
         orderMaster.setPayStatus(PayStatus.WAIT_PAY.getCode());
         orderMaster.setCreateTime(new Date());
         orderMaster.setWorkerId(goods.getWorkerId());
-        orderMaster.setRevTime(DateUtils.parseDate(appOrderRequest.getServerTime(), com.ghy.common.utils.DateUtils.YYYY_MM_DD_HH_MM_SS));
+//        orderMaster.setRevTime(DateUtils.parseDate(appOrderRequest.getServerTime(), com.ghy.common.utils.DateUtils.YYYY_MM_DD_HH_MM_SS));
+        orderMaster.setExpectTimeStart(DateUtils.parseDate(appOrderRequest.getExpectTimeStart(), com.ghy.common.utils.DateUtils.YYYY_MM_DD_HH_MM_SS));
+        orderMaster.setExpectTimeEnd(DateUtils.parseDate(appOrderRequest.getExpectTimeEnd(), com.ghy.common.utils.DateUtils.YYYY_MM_DD_HH_MM_SS));
         orderMasterService.insertOrderMaster(orderMaster);
         Assert.notNull(orderMaster.getId(), "OrderMaster.id is null!");
 

ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java

@@ -146,6 +146,8 @@ public class OrderDetailController extends BaseController {
             orderListResponse.setStandardList(standardList);
             orderListResponse.setAddress(customerAddress.getAddress());
             orderListResponse.setServerTime(detail.getRevTime());
+            orderListResponse.setExpectTimeStart(detail.getExpectTimeStart());
+            orderListResponse.setExpectTimeEnd(detail.getExpectTimeEnd());
             orderListResponse.setCreateTime(detail.getCreateTime());
             orderListResponse.setWorkBeginTime(detail.getWorkBeginTime());
             orderListResponse.setWorkFinishTime(detail.getWorkFinishTime());
@@ -223,6 +225,8 @@ public class OrderDetailController extends BaseController {
             orderListResponse.setStandardList(standardList);
             orderListResponse.setAddress(customerAddress.getAddress());
             orderListResponse.setServerTime(detail.getRevTime());
+            orderListResponse.setExpectTimeStart(detail.getExpectTimeStart());
+            orderListResponse.setExpectTimeEnd(detail.getExpectTimeEnd());
             orderListResponse.setWorkBeginTime(detail.getWorkBeginTime());
             orderListResponse.setWorkFinishTime(detail.getWorkFinishTime());
             orderListResponses.add(orderListResponse);

ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java

@@ -140,6 +140,8 @@ public class OrderMasterController extends BaseController {
             orderListResponse.setCustomerName(customer.getName());
             orderListResponse.setCustomerPhone(customer.getPhone());
             orderListResponse.setServerTime(master.getRevTime());
+            orderListResponse.setExpectTimeStart(master.getExpectTimeStart());
+            orderListResponse.setExpectTimeEnd(master.getExpectTimeEnd());
             orderListResponse.setOrderStatus(master.getOrderStatus());
             orderListResponse.setPayStatus(master.getPayStatus());
             orderListResponse.setPayType(master.getPayType());
@@ -185,6 +187,8 @@ public class OrderMasterController extends BaseController {
                 orderStandardDetail.setWorkerName(detailWorker.getName());
                 orderStandardDetail.setWorkerPhone(detailWorker.getPhone());
                 orderStandardDetail.setRevTime(orderDetail.getRevTime());
+                orderStandardDetail.setExpectTimeStart(orderDetail.getExpectTimeStart());
+                orderStandardDetail.setExpectTimeEnd(orderDetail.getExpectTimeEnd());
                 orderStandardDetail.setOrderStandardList(standardList);
 
                 orderStandardDetails.add(orderStandardDetail);
@@ -241,6 +245,8 @@ public class OrderMasterController extends BaseController {
             orderListResponse.setStandardList(standardList);
             orderListResponse.setAddress(customerAddress.getAddress());
             orderListResponse.setServerTime(orderMaster.getRevTime());
+            orderListResponse.setExpectTimeStart(orderMaster.getExpectTimeStart());
+            orderListResponse.setExpectTimeEnd(orderMaster.getExpectTimeEnd());
             orderListResponse.setCreateTime(orderMaster.getCreateTime());
             orderListResponse.setOrderStandardDetailList(orderStandardDetails);
 

ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderListResponse.java

@@ -29,6 +29,10 @@ public class OrderListResponse {
 
     private Date serverTime;
 
+    private Date expectTimeStart;
+
+    private Date expectTimeEnd;
+
     private Date workBeginTime;
 
     private Date workFinishTime;

ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderStandardDetail.java

@@ -18,6 +18,10 @@ public class OrderStandardDetail {
 
     private Date revTime;
 
+    private Date expectTimeStart;
+
+    private Date expectTimeEnd;
+
     private Date workBeginTime;
 
     private Date workFinishTime;

ghy-goods/src/main/resources/mapper/goods/GoodsMapper.xml

@@ -100,6 +100,9 @@
             <if test="goodsName != null and goodsName != ''">
                 AND goods_name like concat('%', #{goodsName}, '%')
             </if>
+            <if test="status != null">
+                AND status = #{status}
+            </if>
         </where>
         /* 默认生成时间排序 */
         order by create_time

ghy-order/src/main/java/com/ghy/order/domain/OrderDetail.java

@@ -45,6 +45,10 @@ public class OrderDetail extends BaseEntity {
     @Excel(name = "接单时间", cellType = Excel.ColumnType.STRING)
     private Date revTime;
 
+    private Date expectTimeStart;
+
+    private Date expectTimeEnd;
+
     @Excel(name = "服务开始时间/上门时间", cellType = Excel.ColumnType.STRING)
     private Date workBeginTime;
 

ghy-order/src/main/java/com/ghy/order/domain/OrderMaster.java

@@ -55,6 +55,10 @@ public class OrderMaster extends BaseEntity {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date revTime;
 
+    private Date expectTimeStart;
+
+    private Date expectTimeEnd;
+
     private Worker worker;
 
     private FinancialMaster financialMaster;

ghy-order/src/main/java/com/ghy/order/request/AppOrderRequest.java

@@ -24,6 +24,12 @@ public class AppOrderRequest {
     // 预约上门时间
     private String serverTime;
 
+    // 预计上门时间段 开始时间点
+    private String expectTimeStart;
+
+    // 预计上门时间段 结束时间点
+    private String expectTimeEnd;
+
     // 地址
     private Long addressId;
 

ghy-order/src/main/resources/mapper/order/OrderDetailMapper.xml

@@ -14,6 +14,8 @@
         <result property="orderStatus"       column="order_status"/>
         <result property="workerId"          column="worker_id"/>
         <result property="revTime"           column="rev_time"/>
+        <result property="expectTimeStart"   column="expect_time_start"/>
+        <result property="expectTimeEnd"     column="expect_time_end"/>
         <result property="workBeginTime"     column="work_begin_time"/>
         <result property="workFinishTime"    column="work_finish_time"/>
         <result property="createBy"          column="create_by"/>
@@ -33,6 +35,8 @@
                order_status,
                worker_id,
                rev_time,
+               expect_time_start,
+               expect_time_end,
                work_begin_time,
                work_finish_time,
                create_by,
@@ -93,6 +97,8 @@
             <if test="orderStatus != null">order_status = #{orderStatus},</if>
             <if test="workerId != null and workerId != 0">worker_id = #{workerId},</if>
             <if test="revTime != null">rev_time = #{revTime},</if>
+            <if test="expectTimeStart != null">expect_time_start = #{expectTimeStart},</if>
+            <if test="expectTimeEnd != null">expect_time_end = #{expectTimeEnd},</if>
             <if test="workBeginTime != null">work_begin_time = #{workBeginTime},</if>
             <if test="workFinishTime != null">work_finish_time = #{workFinishTime},</if>
             <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
@@ -111,6 +117,8 @@
         <if test="orderStatus != null">order_status,</if>
         <if test="workerId != null and workerId != 0">worker_id,</if>
         <if test="revTime != null">rev_time,</if>
+        <if test="expectTimeStart != null">expect_time_start,</if>
+        <if test="expectTimeEnd != null">expect_time_end,</if>
         <if test="workBeginTime != null">work_begin_time,</if>
         <if test="workFinishTime != null">work_finish_time,</if>
         <if test="createBy != null and createBy != ''">create_by,</if>
@@ -124,6 +132,8 @@
         <if test="orderStatus != null">#{orderStatus},</if>
         <if test="workerId != null and workerId != 0">#{workerId},</if>
         <if test="revTime != null">#{revTime},</if>
+        <if test="expectTimeStart != null">#{expectTimeStart},</if>
+        <if test="expectTimeEnd != null">#{expectTimeEnd},</if>
         <if test="workBeginTime != null">#{workBeginTime},</if>
         <if test="workFinishTime != null">#{workFinishTime},</if>
         <if test="createBy != null and createBy != ''">#{createBy},</if>
@@ -146,4 +156,4 @@
         </where>
     </select>
 
-</mapper>
+</mapper>

ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml

@@ -17,6 +17,8 @@
         <result property="workerId"          column="worker_id"/>
         <result property="payTime"           column="pay_time"/>
         <result property="revTime"           column="rev_time"/>
+        <result property="expectTimeStart"   column="expect_time_start"/>
+        <result property="expectTimeEnd"     column="expect_time_end"/>
         <result property="createBy"          column="create_by"/>
         <result property="createTime"        column="create_time"/>
         <result property="updateBy"          column="update_by"/>
@@ -37,6 +39,8 @@
                worker_id,
                pay_time,
                rev_time,
+               expect_time_start,
+               expect_time_end,
                create_by,
                create_time,
                remark
@@ -102,6 +106,8 @@
             <if test="workerId != null and workerId != 0">worker_id = #{workerId},</if>
             <if test="payTime != null">pay_time = #{payTime},</if>
             <if test="revTime != null">rev_time = #{revTime},</if>
+            <if test="expectTimeStart != null">expect_time_start = #{expectTimeStart},</if>
+            <if test="expectTimeEnd != null">expect_time_end = #{expectTimeEnd},</if>
             <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
             update_time = SYSDATE()
         </set>
@@ -121,6 +127,8 @@
         <if test="workerId != null and workerId != 0">worker_id,</if>
         <if test="payTime != null">pay_time,</if>
         <if test="revTime != null">rev_time,</if>
+        <if test="expectTimeStart != null">expect_time_start,</if>
+        <if test="expectTimeEnd != null">expect_time_end,</if>
         <if test="createBy != null and createBy != ''">create_by,</if>
         create_time
         )VALUES(
@@ -135,6 +143,8 @@
         <if test="workerId != null and workerId != 0">#{workerId},</if>
         <if test="payTime != null">#{payTime},</if>
         <if test="revTime != null">#{revTime},</if>
+        <if test="expectTimeStart != null">#{expectTimeStart},</if>
+        <if test="expectTimeEnd != null">#{expectTimeEnd},</if>
         <if test="createBy != null and createBy != ''">#{createBy},</if>
         SYSDATE()
         )