商品管理、订单管理

ruoyi-demo/src/main/java/com/ruoyi/demo/controller/GoodsController.java

@@ -4,6 +4,7 @@ import com.ruoyi.common.core.domain.R;
 import com.ruoyi.demo.entity.Goods;
 import com.ruoyi.demo.entity.bo.GoodsBo;
 import com.ruoyi.demo.entity.bo.GoodsDeleteBo;
+import com.ruoyi.demo.entity.bo.PlanBo;
 import com.ruoyi.demo.service.GoodsService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -26,13 +27,14 @@ public class GoodsController {
 
     @DeleteMapping()
     public R deleteGoods(GoodsDeleteBo bo){
-        int total = bo.getDeleteItems().size();
         int i = goodsService.deleteGoods(bo);
-        return R.ok("选择删除" + total + "个，成功删除" + i + "个");
+        if (i == 1)
+            return R.ok("删除成功");
+        return R.fail("删除失败");
     }
 
     @GetMapping("/list")
-    public R goodsList(GoodsBo bo){
+    public R goodsList(PlanBo bo){
         return R.ok(goodsService.getGoodsList(bo));
     }
 
@@ -40,4 +42,12 @@ public class GoodsController {
     public R goodsDetail(GoodsBo bo){
         return R.ok(goodsService.getGoodsDetail(bo));
     }
+
+    @PutMapping()
+    public R editGoods(Goods goods){
+        int i = goodsService.editGoods(goods);
+        if (i == 1)
+            return R.ok("修改成功");
+        return R.fail("修改失败");
+    }
 }

ruoyi-demo/src/main/java/com/ruoyi/demo/controller/OrderController.java

@@ -0,0 +1,28 @@
+package com.ruoyi.demo.controller;
+
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.demo.entity.Order;
+import com.ruoyi.demo.entity.bo.PlanBo;
+import com.ruoyi.demo.service.OrderService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@RequestMapping("/order")
+public class OrderController {
+    @Autowired
+    OrderService orderService;
+
+    @PostMapping()
+    public R addOrder(@RequestBody Order order){
+        int i = orderService.addOrder(order);
+        if (i == 1)
+            return R.ok("添加成功");
+        return R.fail("添加失败");
+    }
+
+    @GetMapping("/list")
+    public R orderList(PlanBo bo){
+        return R.ok(orderService.getOrderList(bo));
+    }
+}

ruoyi-demo/src/main/java/com/ruoyi/demo/entity/vo/GoodsDetailVo.java

@@ -1,9 +1,16 @@
 package com.ruoyi.demo.entity.vo;
 
+import com.ruoyi.demo.entity.Goods;
 import lombok.Data;
 
 @Data
 public class GoodsDetailVo {
     private String goodsLogo;
     private String goodsIntroduce;
+
+    public GoodsDetailVo(){}
+    public GoodsDetailVo(Goods goods){
+        this.goodsLogo = goods.getGoodsLogo();
+        this.goodsIntroduce = goods.getGoodsIntroduce();
+    }
 }

ruoyi-demo/src/main/java/com/ruoyi/demo/service/GoodsService.java

@@ -1,8 +1,10 @@
 package com.ruoyi.demo.service;
 
+import com.github.pagehelper.PageInfo;
 import com.ruoyi.demo.entity.Goods;
 import com.ruoyi.demo.entity.bo.GoodsBo;
 import com.ruoyi.demo.entity.bo.GoodsDeleteBo;
+import com.ruoyi.demo.entity.bo.PlanBo;
 import com.ruoyi.demo.entity.vo.GoodsDetailVo;
 import com.ruoyi.demo.entity.vo.GoodsListVo;
 
@@ -11,6 +13,8 @@ import java.util.List;
 public interface GoodsService {
     int addGoods(Goods goods);
     int deleteGoods(GoodsDeleteBo bo);
-    List<GoodsListVo> getGoodsList(GoodsBo bo);
+    PageInfo<List<GoodsListVo>> getGoodsList(PlanBo bo);
     GoodsDetailVo getGoodsDetail(GoodsBo bo);
+
+    int editGoods(Goods goods);
 }

ruoyi-demo/src/main/java/com/ruoyi/demo/service/OrderService.java

@@ -0,0 +1,12 @@
+package com.ruoyi.demo.service;
+
+import com.github.pagehelper.PageInfo;
+import com.ruoyi.demo.entity.Order;
+import com.ruoyi.demo.entity.bo.PlanBo;
+
+import java.util.List;
+
+public interface OrderService {
+    int addOrder(Order order);
+    PageInfo<List<Order>> getOrderList(PlanBo bo);
+}

ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/GoodsServiceImpl.java

@@ -1,9 +1,13 @@
 package com.ruoyi.demo.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import com.ruoyi.demo.entity.Goods;
 import com.ruoyi.demo.entity.bo.GoodsBo;
 import com.ruoyi.demo.entity.bo.GoodsDeleteBo;
+import com.ruoyi.demo.entity.bo.PlanBo;
 import com.ruoyi.demo.entity.vo.GoodsDetailVo;
 import com.ruoyi.demo.entity.vo.GoodsListVo;
 import com.ruoyi.demo.mapper.GoodsMapper;
@@ -13,6 +17,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.List;
 
 @Service
@@ -35,23 +40,41 @@ public class GoodsServiceImpl implements GoodsService {
 
     @Override
     public int deleteGoods(GoodsDeleteBo bo) {
-        int i = 0;
-        for (GoodsBo item : bo.getDeleteItems()) {
-            QueryWrapper<Goods> goodsQueryWrapper = new QueryWrapper<>();
-            goodsQueryWrapper.eq("appkey",item.getAppkey());
-            goodsQueryWrapper.eq("goodsId",item.getGoodsId());
-            i += goodsMapper.delete(goodsQueryWrapper);
-        }
-        return i;
+        QueryWrapper<Goods> goodsQueryWrapper = new QueryWrapper<>();
+        goodsQueryWrapper.eq("appkey",bo.getAppkey());
+        goodsQueryWrapper.eq("goodsId",bo.getGoodsId());
+        return goodsMapper.delete(goodsQueryWrapper);
     }
 
     @Override
-    public List<GoodsListVo> getGoodsList(GoodsBo bo) {
-        return null;
+    public PageInfo<List<GoodsListVo>> getGoodsList(PlanBo bo) {
+        PageHelper.startPage(bo.getPageNum(),bo.getPageSize(),true);
+        QueryWrapper<Goods> queryWrapper = new QueryWrapper<>();
+        if (bo.getStartTime() != null)
+            queryWrapper.apply("DATE_FORMAT(create_time,'%Y-%m-%d %H:%i:%s') <= DATE_FORMAT({0},'%Y-%m-%d %H:%i:%s')",bo.getStartTime());
+        if (bo.getEndTime() != null)
+            queryWrapper.apply("DATE_FORMAT(create_time,'%Y-%m-%d %H:%i:%s') > DATE_FORMAT({0},'%Y-%m-%d %H:%i:%s')",bo.getEndTime());
+        List<GoodsListVo> vos = new ArrayList<>();
+        for (Goods goods : goodsMapper.selectList(queryWrapper)) {
+            vos.add(new GoodsListVo(goods));
+        }
+        return new PageInfo(vos);
     }
 
     @Override
     public GoodsDetailVo getGoodsDetail(GoodsBo bo) {
-        return null;
+        QueryWrapper<Goods> goodsQueryWrapper = new QueryWrapper<>();
+        goodsQueryWrapper.eq("appkey",bo.getAppkey());
+        goodsQueryWrapper.eq("goodsId",bo.getGoodsId());
+        Goods goods = goodsMapper.selectOne(goodsQueryWrapper);
+        return new GoodsDetailVo(goods);
+    }
+
+    @Override
+    public int editGoods(Goods goods) {
+        QueryWrapper<Goods> goodsQueryWrapper = new QueryWrapper<>();
+        goodsQueryWrapper.eq("appkey",goods.getAppkey());
+        goodsQueryWrapper.eq("goodsId",goods.getGoodsId());
+        return goodsMapper.update(goods,goodsQueryWrapper);
     }
 }

ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/OrderServiceImpl.java

@@ -0,0 +1,46 @@
+package com.ruoyi.demo.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.ruoyi.demo.entity.Order;
+import com.ruoyi.demo.entity.bo.PlanBo;
+import com.ruoyi.demo.mapper.OrderMapper;
+import com.ruoyi.demo.service.OrderService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+@Service
+@Transactional
+public class OrderServiceImpl implements OrderService {
+    @Autowired
+    OrderMapper orderMapper;
+
+    @Override
+    public int addOrder(Order order) {
+        return orderMapper.insert(order);
+    }
+
+    @Override
+    public PageInfo<List<Order>> getOrderList(PlanBo bo) {
+        PageHelper.startPage(bo.getPageNum(),bo.getPageSize(),true);
+        QueryWrapper<Order> queryWrapper = new QueryWrapper<>();
+        if (bo.getText() != null)
+            queryWrapper.like("order_id",bo.getText())
+                .or()
+                .like("goods_name",bo.getText())
+                .or()
+                .like("user_name",bo.getText())
+                .or()
+                .like("commercial_name",bo.getText());
+        if (bo.getStartTime() != null)
+            queryWrapper.apply("DATE_FORMAT(create_time,'%Y-%m-%d %H:%i:%s') <= DATE_FORMAT({0},'%Y-%m-%d %H:%i:%s')",bo.getStartTime());
+        if (bo.getEndTime() != null)
+            queryWrapper.apply("DATE_FORMAT(create_time,'%Y-%m-%d %H:%i:%s') > DATE_FORMAT({0},'%Y-%m-%d %H:%i:%s')",bo.getEndTime());
+        List<Order> orders = orderMapper.selectList(queryWrapper);
+        return new PageInfo(orders);
+    }
+}

ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/StatisticsServiceImpl.java

@@ -28,9 +28,9 @@ public class StatisticsServiceImpl implements StatisticsService {
         PageHelper.startPage(bo.getPageNum(),bo.getPageSize(),true);
         QueryWrapper<Statistics> queryWrapper = new QueryWrapper<>();
         if (bo.getStartTime() != null)
-            queryWrapper.apply("DATE_FORMAT(plan_start_time,'%Y-%m-%d %H:%i:%s') <= DATE_FORMAT({0},'%Y-%m-%d %H:%i:%s')",bo.getStartTime());
+            queryWrapper.apply("DATE_FORMAT(time,'%Y-%m-%d %H:%i:%s') <= DATE_FORMAT({0},'%Y-%m-%d %H:%i:%s')",bo.getStartTime());
         if (bo.getEndTime() != null)
-            queryWrapper.apply("DATE_FORMAT(plan_end_time,'%Y-%m-%d %H:%i:%s') > DATE_FORMAT({0},'%Y-%m-%d %H:%i:%s')",bo.getEndTime());
+            queryWrapper.apply("DATE_FORMAT(time,'%Y-%m-%d %H:%i:%s') > DATE_FORMAT({0},'%Y-%m-%d %H:%i:%s')",bo.getEndTime());
         List<Statistics> list = statisticsMapper.selectList(queryWrapper);
         List<ScanListVo> vos = new ArrayList<>();
         for (Statistics statistics : list){