首页轮播图接口优化

api-interface/itmk-base-parent/itmk-base-web/src/main/java/com/itmk/web/banner/entity/SysBanner.java

@@ -1,8 +1,10 @@
 package com.itmk.web.banner.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.itmk.web.goods.entity.SysGoods;
 import lombok.Data;
 
 @Data
@@ -15,4 +17,6 @@ public class SysBanner {
     private String images;
     private String status;
     private Integer orderNum;
+    @TableField(exist = false)
+    private SysGoods sysGoods;
 }

api-interface/itmk-base-parent/itmk-base-web/src/main/java/com/itmk/web/order/controller/UserOrderController.java

@@ -77,6 +77,18 @@ public class UserOrderController {
         }
         return ResultUtils.error("取消失败!");
     }
+    //确定收货
+    @PostMapping("/confirmOrder")
+    public ResultVo confirmOrder(@RequestBody SendParm parm){
+        //更新条件
+        LambdaUpdateWrapper<UserOrder> query = new LambdaUpdateWrapper<>();
+        query.eq(UserOrder::getOrderId,parm.getOrderId())
+                .set(UserOrder::getStatus,"2");
+        if(userOrderService.update(query)){
+            return ResultUtils.success("收货成功!");
+        }
+        return ResultUtils.error("收货失败!");
+    }
     //首页统计 0:日 1：月 2：年
     @GetMapping("/getTotal")
     public ResultVo getTotal(String type){

api-interface/itmk-base-parent/itmk-base-web/src/main/java/com/itmk/web/wxapi/controller/HomeController.java

@@ -1,6 +1,7 @@
 package com.itmk.web.wxapi.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.itmk.utils.ResultUtils;
 import com.itmk.utils.ResultVo;
 import com.itmk.web.goods.entity.SysGoods;
@@ -32,6 +33,21 @@ public class HomeController {
         QueryWrapper<SysBanner> query = new QueryWrapper<>();
         query.lambda().eq(SysBanner::getStatus,"1");
         List<SysBanner> list = sysBannerService.list(query);
+        if(list.size() > 0){
+            for (int i=0;i<list.size();i++){
+                if(StringUtils.isNotEmpty(list.get(i).getGoodsId().toString())){
+                    //查询商品
+                    SysGoods goods = sysGoodsService.getById(list.get(i).getGoodsId());
+                    list.get(i).setSysGoods(goods);
+                    //查询价格
+                    QueryWrapper<SysGoodsSpecs> queryWrapper = new QueryWrapper<>();
+                    queryWrapper.lambda().eq(SysGoodsSpecs::getGoodsId,list.get(i).getGoodsId())
+                            .orderByAsc(SysGoodsSpecs::getOrderNum);
+                    List<SysGoodsSpecs> specs = sysGoodsSpecsService.list(queryWrapper);
+                    list.get(i).getSysGoods().setSpecs(specs);
+                }
+            }
+        }
         return ResultUtils.success("查询成功",list);
     }
 

api-interface/itmk-base-parent/itmk-base-web/src/main/resources/mapper/UserOrderMapper.xml

@@ -2,14 +2,14 @@
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.itmk.web.user_order.mapper.UserOrderMapper">
-    <select id="getDays" resultType="com.itmk.web.user_order.entity.SunList">
-        select DATE_FORMAT(create_time,'%Y-%m-%d')days,sum(price)price  from user_order where `status` = '2' group by days order by days asc
+<mapper namespace="com.itmk.web.order.mapper.UserOrderMapper">
+    <select id="getDays" resultType="com.itmk.web.order.entity.SunList">
+        select DATE_FORMAT(create_time,'%Y-%m-%d')days,sum(price)price  from order where `status` = '2' group by days order by days asc
     </select>
-    <select id="getMonths" resultType="com.itmk.web.user_order.entity.SunList">
-        select DATE_FORMAT(create_time,'%Y-%m')days,sum(price)price  from user_order where `status` = '2' group by days order by days asc
-    </select><select id="getYears" resultType="com.itmk.web.user_order.entity.SunList">
-    select DATE_FORMAT(create_time,'%Y')days,sum(price)price  from user_order where `status` = '2' group by days order by days asc
+    <select id="getMonths" resultType="com.itmk.web.order.entity.SunList">
+        select DATE_FORMAT(create_time,'%Y-%m')days,sum(price)price  from order where `status` = '2' group by days order by days asc
+    </select><select id="getYears" resultType="com.itmk.web.order.entity.SunList">
+    select DATE_FORMAT(create_time,'%Y')days,sum(price)price  from order where `status` = '2' group by days order by days asc
 </select>
 
 </mapper>