测试首页、广告管理、广告计划管理、广告推送、广告投放完成

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

@@ -26,7 +26,7 @@ public class GoodsController {
     }
 
     @DeleteMapping()
-    public R deleteGoods(GoodsDeleteBo bo){
+    public R deleteGoods(@RequestBody GoodsDeleteBo bo){
         int i = goodsService.deleteGoods(bo);
         if (i == 1)
             return R.ok("删除成功");
@@ -34,17 +34,17 @@ public class GoodsController {
     }
 
     @GetMapping("/list")
-    public R goodsList(PlanBo bo){
+    public R goodsList(@RequestBody PlanBo bo){
         return R.ok(goodsService.getGoodsList(bo));
     }
 
     @GetMapping("/detail")
-    public R goodsDetail(GoodsBo bo){
+    public R goodsDetail(@RequestBody GoodsBo bo){
         return R.ok(goodsService.getGoodsDetail(bo));
     }
 
     @PutMapping()
-    public R editGoods(Goods goods){
+    public R editGoods(@RequestBody Goods goods){
         int i = goodsService.editGoods(goods);
         if (i == 1)
             return R.ok("修改成功");

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

@@ -22,7 +22,7 @@ public class OrderController {
     }
 
     @GetMapping("/list")
-    public R orderList(PlanBo bo){
+    public R orderList(@RequestBody PlanBo bo){
         return R.ok(orderService.getOrderList(bo));
     }
 }

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

@@ -32,7 +32,7 @@ public class PlanController {
     }
     // 查询广告计划列表
     @GetMapping("/list")
-    public R planList(PlanBo bo){
+    public R planList(@RequestBody PlanBo bo){
         PageInfo<List<PlanListVo>> planList = planService.getPlanList(bo);
         return R.ok(planList);
     }
@@ -52,7 +52,7 @@ public class PlanController {
     // 广告计划管理
     // 审核广告计划
     @PutMapping("/audit")
-    public R checkPlan(PlanBo bo){
+    public R checkPlan(@RequestBody PlanBo bo){
         // 获取用户id和用户名
         String userId = "1";
         int i = planService.checkPlan(bo,userId);
@@ -74,7 +74,7 @@ public class PlanController {
     }
     // 查询广告计划管理列表
     @GetMapping("/audit/list")
-    public R auditList(PlanBo bo){
+    public R auditList(@RequestBody PlanBo bo){
         PageInfo<List<PlanManageListVo>> list = planService.getPlanManageList(bo);
         return R.ok(list);
     }
@@ -109,7 +109,7 @@ public class PlanController {
     }
     // 查询广告计划推送计划列表
     @GetMapping("/push/list")
-    public R pushList(PlanBo bo){
+    public R pushList(@RequestBody PlanBo bo){
         PageInfo<List<PlanPushListVo>> list = planService.getPlanPushList(bo);
         return R.ok(list);
     }
@@ -117,7 +117,7 @@ public class PlanController {
     // 广告投放
     // 广告投放列表
     @GetMapping("/statistics/list")
-    public R statisticsList(PlanBo bo){
+    public R statisticsList(@RequestBody PlanBo bo){
         PageInfo<List<PlanPushStatisticsListVo>> list = planService.getPlanPushStatisticsList(bo);
         return R.ok(list);
     }
@@ -132,7 +132,7 @@ public class PlanController {
     // 其他
     // 获取设备信息
     @GetMapping("/getEquipments")
-    public R getEquipments(PlanBo bo){
+    public R getEquipments(@RequestBody PlanBo bo){
         return R.ok(planService.getEquipments(bo));
     }
     // 下拉框——获取省市区地区码

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

@@ -5,6 +5,7 @@ import com.ruoyi.demo.entity.bo.PlanBo;
 import com.ruoyi.demo.service.StatisticsService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -15,7 +16,7 @@ public class StatisticsController {
     StatisticsService statisticsService;
 
     @GetMapping("/scanList")
-    public R scanList(PlanBo bo){
+    public R scanList(@RequestBody PlanBo bo){
         return R.ok(statisticsService.getScanList(bo));
     }
 

ruoyi-demo/src/main/java/com/ruoyi/demo/entity/Goods.java

@@ -37,5 +37,5 @@ public class Goods {
     private LocalDateTime createTime;
 
     @TableField("deleted")
-    private String deleted;
+    private int deleted;
 }

ruoyi-demo/src/main/java/com/ruoyi/demo/entity/Order.java

@@ -49,5 +49,5 @@ public class Order {
     private LocalDateTime createTime;
 
     @TableField("deleted")
-    private String deleted;
+    private int deleted;
 }

ruoyi-demo/src/main/java/com/ruoyi/demo/entity/Plan.java

@@ -10,6 +10,7 @@ import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
 import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
 import com.ruoyi.demo.entity.bo.PlanAddBo;
+import com.ruoyi.demo.utils.OnStateUtil;
 import com.ruoyi.demo.utils.StateUtil;
 import lombok.Data;
 
@@ -72,7 +73,7 @@ public class Plan {
     private String principalTelephone;
 
     @TableField("deleted")
-    private String deleted;
+    private int deleted;
 
     public Plan(){}
     public Plan(Commercial commercial, App app, PlanAddBo bo){
@@ -80,15 +81,23 @@ public class Plan {
         this.setCommercialName(commercial.getCommercialName());
         this.setAppkey(app.getAppkey());
         this.setAppName(app.getAppName());
+
+        this.setPlanName(bo.getPlanName());
+
         this.setGoodsId(bo.getGoodsId());
         this.setGoodsImg(bo.getGoodsImg());
         this.setGoodsName(bo.getGoodsName());
         this.setGoodsLogo(bo.getGoodsLogo());
+        this.setGoodsPrice(bo.getGoodsPrice());
         this.setGoodsIntroduce(bo.getGoodsIntroduce());
         this.setGoodsClassify(bo.getGoodsClassify());
         this.setPlanCreateTime(bo.getPlanCreateTime());
         this.setPlanStartTime(bo.getPlanStartTime());
         this.setPlanEndTime(bo.getPlanEndTime());
         this.setState(StateUtil.NOT_AUDITED);
+
+        this.setOnState(OnStateUtil.UP);
+        this.setPrincipalName(bo.getPrincipalName());
+        this.setPrincipalTelephone(bo.getPrincipalTelephone());
     }
 }

ruoyi-demo/src/main/java/com/ruoyi/demo/entity/PlanAudit.java

@@ -33,7 +33,7 @@ public class PlanAudit {
     private LocalDateTime auditTime;
 
     @TableField("deleted")
-    private String deleted;
+    private int deleted;
 
     public PlanAudit (){}
     public PlanAudit(PlanBo bo,String userId){

ruoyi-demo/src/main/java/com/ruoyi/demo/entity/PlanItem.java

@@ -33,7 +33,7 @@ public class PlanItem {
     private String sort;
 
     @TableField("deleted")
-    private String deleted;
+    private int deleted;
 
     public PlanItem(){}
     public PlanItem(String planId, PlanItemAddBo bo){
@@ -45,5 +45,6 @@ public class PlanItem {
         this.addrCode = bo.getAddrCode();
         this.addrCodeInfo = bo.getAddrCodeInfo();
         this.qrCode = bo.getQrCode();
+        this.sort = "0";
     }
 }

ruoyi-demo/src/main/java/com/ruoyi/demo/entity/Statistics.java

@@ -57,5 +57,5 @@ public class Statistics {
     private LocalDateTime time;
 
     @TableField("deleted")
-    private String deleted;
+    private int deleted;
 }

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

@@ -28,6 +28,7 @@ public class PlanListVo {
     public PlanListVo(){}
     public PlanListVo(Plan plan){
         this.planId = plan.getPlanId();
+        this.planName = plan.getPlanName();
         this.principalName = plan.getPrincipalName();
         this.principalTelephone = plan.getPrincipalTelephone();
         this.goodsImg = plan.getGoodsImg();

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

@@ -33,7 +33,7 @@ public class PlanPushStatisticsListVo {
         this.equipmentName = statistics.getEquipmentName();
         this.carouselCount = statistics.getCarouselCount();
         this.scanCodeCount = statistics.getScanCodeCount();
-        float r = (float) statistics.getTradeCount()/statistics.getCarouselCount();
+        float r = (float) statistics.getTradeCount()/statistics.getScanCodeCount();
         this.ratio = ((int)(r*100)+"%");
         this.totalUserCount = statistics.getTotalUserCount();
         this.totalPrice = statistics.getTotalPrice();

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

@@ -51,9 +51,9 @@ public class GoodsServiceImpl implements GoodsService {
         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());
+            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());
+            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));

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

@@ -37,9 +37,9 @@ public class OrderServiceImpl implements OrderService {
                 .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());
+            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());
+            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/PlanServiceImpl.java

@@ -89,6 +89,9 @@ public class PlanServiceImpl implements PlanService {
 
     @Override
     public int deletePlan(String id) {
+        QueryWrapper<PlanItem> itemQueryWrapper = new QueryWrapper<>();
+        itemQueryWrapper.eq("plan_id",id);
+        planItemMapper.delete(itemQueryWrapper);
         QueryWrapper<Plan> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("plan_id",id);
         return planMapper.delete(queryWrapper);
@@ -252,7 +255,7 @@ public class PlanServiceImpl implements PlanService {
         PageHelper.startPage(bo.getPageNum(),bo.getPageSize(),true);
         QueryWrapper<Plan> planQueryWrapper = new QueryWrapper<>();
         planQueryWrapper.eq("appkey",bo.getAppkey());
-        planQueryWrapper.eq("commercialId",bo.getCommercialId());
+        planQueryWrapper.eq("commercial_id",bo.getCommercialId());
         if (bo.getText() != null)
             planQueryWrapper.like("plan_id",bo.getText())
                 .or()
@@ -288,9 +291,9 @@ public class PlanServiceImpl implements PlanService {
                 .or()
                 .like("equipment_name",bo.getText());
         if (bo.getStartTime() != null)
-            statisticsQueryWrapper.apply("DATE_FORMAT(plan_start_time,'%Y-%m-%d %H:%i:%s') <= DATE_FORMAT({0},'%Y-%m-%d %H:%i:%s')",bo.getStartTime());
+            statisticsQueryWrapper.apply("DATE_FORMAT(laster_time,'%Y-%m-%d %H:%i:%s') >= DATE_FORMAT({0},'%Y-%m-%d %H:%i:%s')",bo.getStartTime());
         if (bo.getEndTime() != null)
-            statisticsQueryWrapper.apply("DATE_FORMAT(plan_end_time,'%Y-%m-%d %H:%i:%s') > DATE_FORMAT({0},'%Y-%m-%d %H:%i:%s')",bo.getEndTime());
+            statisticsQueryWrapper.apply("DATE_FORMAT(laster_time,'%Y-%m-%d %H:%i:%s') <= DATE_FORMAT({0},'%Y-%m-%d %H:%i:%s')",bo.getEndTime());
         List<PlanPushStatistics> list = planPushStatisticsMapper.selectList(statisticsQueryWrapper);
         List<PlanPushStatisticsListVo> vos = new ArrayList<>();
         for (PlanPushStatistics statistics : list){
@@ -319,8 +322,20 @@ public class PlanServiceImpl implements PlanService {
             equipmentQueryWrapper.like("equipment_id",bo.getText())
                 .or()
                 .like("equipment_name",bo.getText());
-        if (bo.getAddrCodes() != null)
-            equipmentQueryWrapper.in("addr_code",bo.getAddrCodes());
+        if (bo.getAddrCodes() != null){
+            for (String addrCode : bo.getAddrCodes()){
+                String province = String.valueOf(addrCode.charAt(0))+String.valueOf(addrCode.charAt(1));
+                String city = String.valueOf(addrCode.charAt(2))+String.valueOf(addrCode.charAt(3));
+                String district = String.valueOf(addrCode.charAt(4))+String.valueOf(addrCode.charAt(5));
+                if (district.equals("00")){
+                    if (city.equals("00"))
+                        equipmentQueryWrapper.or().likeRight("addr_code",province);
+                    else
+                        equipmentQueryWrapper.or().likeRight("addr_code",province+city);
+                }else
+                    equipmentQueryWrapper.or().likeRight("addr_code",province+city+district);
+            }
+        }
         return new PageInfo(equipmentMapper.selectList(equipmentQueryWrapper));
     }
 }

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(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(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){

ruoyi-demo/src/main/java/com/ruoyi/demo/utils/SignUtil.java

@@ -32,6 +32,8 @@ public class SignUtil {
     public static boolean verify(Map<String, Object> params, String appSecret) {
         String signed = (String) params.remove("sign");
         String sign = sign(params, appSecret);
+//        System.out.println("signed:"+signed);
+//        System.out.println("sign:"+sign);
         return sign.equals(signed);
     }
 }