添加供应商字段，并修改相关接口

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

@@ -2,6 +2,7 @@ package com.ruoyi.demo.controller;
 
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.demo.entity.Order;
+import com.ruoyi.demo.entity.bo.OrderAddBo;
 import com.ruoyi.demo.entity.bo.PlanBo;
 import com.ruoyi.demo.service.OrderService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -13,11 +14,25 @@ public class OrderController {
     @Autowired
     OrderService orderService;
 
+    // 获取sign——用于测试
+    @PostMapping("/getSign")
+    public R getSign(@RequestBody OrderAddBo bo){
+        String sign = orderService.getSign(bo);
+        if (sign.equals("error"))
+            return R.fail("无效的appkey");
+        return R.ok(sign);
+    }
+
+    // 添加订单
     @PostMapping()
-    public R addOrder(@RequestBody Order order){
-        int i = orderService.addOrder(order);
+    public R addOrder(@RequestBody OrderAddBo bo){
+        int i = orderService.addOrder(bo);
         if (i == 1)
             return R.ok("添加成功");
+        if (i == -1)
+            return R.fail("无效的appkey");
+        if (i == -3)
+            return R.fail("校验sign出错");
         return R.fail("添加失败");
     }
 

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

@@ -97,7 +97,10 @@ public class PlanController {
     // 获取sign——用于测试
     @PostMapping("/getSign")
     public R getSign(@RequestBody PlanAddBo bo){
-        return R.ok(planService.getSign(bo));
+        String sign = planService.getSign(bo);
+        if (sign.equals("error"))
+            return R.fail("无效的appkey");
+        return R.ok(sign);
     }
     // 添加广告推送计划
     @PostMapping()

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

@@ -3,6 +3,7 @@ package com.ruoyi.demo.controller;
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.demo.entity.Statistics;
 import com.ruoyi.demo.entity.bo.PlanBo;
+import com.ruoyi.demo.entity.bo.StatisticsAddBo;
 import com.ruoyi.demo.service.StatisticsService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -25,12 +26,25 @@ public class StatisticsController {
         return R.ok(statisticsService.getScanTotal());
     }
 
+    // 获取sign——用于测试
+    @PostMapping("/getSign")
+    public R getSign(@RequestBody StatisticsAddBo bo){
+        String sign = statisticsService.getSign(bo);
+        if (sign.equals("error"))
+            return R.fail("无效的appkey");
+        return R.ok(sign);
+    }
+
     // 添加行为记录
     @PostMapping()
-    public R add(@RequestBody Statistics bo){
+    public R add(@RequestBody StatisticsAddBo bo){
         int i = statisticsService.add(bo);
         if (i == 1)
             return R.ok("添加成功");
+        if (i == -1)
+            return R.fail("无效的appkey");
+        if (i == -3)
+            return R.fail("校验sign出错");
         return R.fail("添加失败");
     }
 }

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

@@ -16,6 +16,12 @@ import java.time.LocalDateTime;
 public class Order {
     @TableField("order_id")
     private String orderId;
+
+    @TableField("vendor_id")
+    private String vendorId;
+    @TableField("vendor_name")
+    private String vendorName;
+
     @TableField("goods_id")
     private String goodsId;
     @TableField("goods_name")

ruoyi-demo/src/main/java/com/ruoyi/demo/entity/bo/OrderAddBo.java

@@ -0,0 +1,9 @@
+package com.ruoyi.demo.entity.bo;
+
+import com.ruoyi.demo.entity.Order;
+import lombok.Data;
+
+@Data
+public class OrderAddBo extends Order {
+    private String sign;
+}

ruoyi-demo/src/main/java/com/ruoyi/demo/entity/bo/StatisticsAddBo.java

@@ -0,0 +1,9 @@
+package com.ruoyi.demo.entity.bo;
+
+import com.ruoyi.demo.entity.Statistics;
+import lombok.Data;
+
+@Data
+public class StatisticsAddBo extends Statistics {
+    private String sign;
+}

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

@@ -2,11 +2,13 @@ package com.ruoyi.demo.service;
 
 import com.github.pagehelper.PageInfo;
 import com.ruoyi.demo.entity.Order;
+import com.ruoyi.demo.entity.bo.OrderAddBo;
 import com.ruoyi.demo.entity.bo.PlanBo;
 
 import java.util.List;
 
 public interface OrderService {
-    int addOrder(Order order);
+    String getSign(OrderAddBo bo);
+    int addOrder(OrderAddBo bo);
     PageInfo<List<Order>> getOrderList(PlanBo bo);
 }

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

@@ -3,6 +3,7 @@ package com.ruoyi.demo.service;
 import com.github.pagehelper.PageInfo;
 import com.ruoyi.demo.entity.Statistics;
 import com.ruoyi.demo.entity.bo.PlanBo;
+import com.ruoyi.demo.entity.bo.StatisticsAddBo;
 import com.ruoyi.demo.entity.vo.PlanHomeVo;
 import com.ruoyi.demo.entity.vo.ScanListVo;
 
@@ -12,5 +13,6 @@ public interface StatisticsService {
     PageInfo<List<ScanListVo>> getScanList(PlanBo bo);
     PlanHomeVo getScanTotal();
 
-    int add(Statistics bo);
+    String getSign(StatisticsAddBo bo);
+    int add(StatisticsAddBo bo);
 }

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

@@ -1,27 +1,90 @@
 package com.ruoyi.demo.service.impl;
 
+import cn.hutool.core.lang.Dict;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.ruoyi.demo.entity.App;
 import com.ruoyi.demo.entity.Order;
+import com.ruoyi.demo.entity.bo.OrderAddBo;
 import com.ruoyi.demo.entity.bo.PlanBo;
+import com.ruoyi.demo.mapper.AppMapper;
 import com.ruoyi.demo.mapper.OrderMapper;
 import com.ruoyi.demo.service.OrderService;
+import com.ruoyi.demo.utils.SignUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
+import java.util.Map;
 
 @Service
 @Transactional
 public class OrderServiceImpl implements OrderService {
     @Autowired
     OrderMapper orderMapper;
+    @Autowired
+    AppMapper appMapper;
+
+    @Override
+    public String getSign(OrderAddBo bo) {
+        QueryWrapper<App> appQueryWrapper = new QueryWrapper<>();
+        appQueryWrapper.eq("appkey",bo.getAppkey());
+        App app = appMapper.selectOne(appQueryWrapper);
+        if (app == null)
+            return "error";
+        Map<String,Object> params = Dict.create()
+            .set("appName",bo.getAppName())
+            .set("appkey",bo.getAppkey())
+            .set("commercialId",bo.getCommercialId())
+            .set("commercialName",bo.getCommercialName())
+            .set("createTime",bo.getCreateTime())
+            .set("goodsId",bo.getGoodsId())
+            .set("goodsName",bo.getGoodsName())
+            .set("goodsPrice",bo.getGoodsPrice())
+            .set("orderId",bo.getOrderId())
+            .set("totalPrice",bo.getTotalPrice())
+            .set("userId",bo.getUserId())
+            .set("userName",bo.getUserName())
+            .set("userTelephone",bo.getUserTelephone())
+            .set("vendorId",bo.getVendorId())
+            .set("vendorName",bo.getVendorName())
+            .set("sign",null)
+            .set("specs",bo.getSpecs())
+            .set("state",bo.getState());
+        return SignUtil.sign(params,app.getAppSecret());
+    }
 
     @Override
-    public int addOrder(Order order) {
-        return orderMapper.insert(order);
+    public int addOrder(OrderAddBo bo) {
+        QueryWrapper<App> appQueryWrapper = new QueryWrapper<>();
+        appQueryWrapper.eq("appkey",bo.getAppkey());
+        App app = appMapper.selectOne(appQueryWrapper);
+        if (app == null)
+            return -1;
+        Map<String,Object> params = Dict.create()
+            .set("appName",bo.getAppName())
+            .set("appkey",bo.getAppkey())
+            .set("commercialId",bo.getCommercialId())
+            .set("commercialName",bo.getCommercialName())
+            .set("createTime",bo.getCreateTime())
+            .set("goodsId",bo.getGoodsId())
+            .set("goodsName",bo.getGoodsName())
+            .set("goodsPrice",bo.getGoodsPrice())
+            .set("orderId",bo.getOrderId())
+            .set("totalPrice",bo.getTotalPrice())
+            .set("userId",bo.getUserId())
+            .set("userName",bo.getUserName())
+            .set("userTelephone",bo.getUserTelephone())
+            .set("vendorId",bo.getVendorId())
+            .set("vendorName",bo.getVendorName())
+            .set("sign",bo.getSign())
+            .set("specs",bo.getSpecs())
+            .set("state",bo.getState());
+        if (!SignUtil.verify(params,app.getAppSecret()))
+            return -3;
+        return orderMapper.insert(bo);
     }
 
     @Override

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

@@ -62,19 +62,19 @@ public class PlanServiceImpl implements PlanService {
             return "error";
         Map<String,Object> params = Dict.create()
             .set("appkey",bo.getAppkey())
-            .set("vendorId",bo.getVendorId())
-            .set("vendorName",bo.getVendorName())
             .set("goodsId",bo.getGoodsId())
             .set("goodsImg",bo.getGoodsImg())
-            .set("goodsName",bo.getGoodsName())
-            .set("goodsLogo",bo.getGoodsLogo())
             .set("goodsIntroduce",bo.getGoodsIntroduce())
-            .set("goodsPrice",bo.getGoodsPrice())
+            .set("goodsLogo",bo.getGoodsLogo())
+            .set("goodsName",bo.getGoodsName())
             .set("goodsClassify",bo.getGoodsClassify())
-            .set("planStartTime",bo.getPlanStartTime())
-            .set("planEndTime",bo.getPlanEndTime())
+            .set("goodsPrice",bo.getGoodsPrice())
             .set("items",bo.getItems())
-            .set("sign",null);
+            .set("planEndTime",bo.getPlanEndTime())
+            .set("planStartTime",bo.getPlanStartTime())
+            .set("sign",null)
+            .set("vendorId",bo.getVendorId())
+            .set("vendorName",bo.getVendorName());
         return SignUtil.sign(params,app.getAppSecret());
     }
 
@@ -88,19 +88,19 @@ public class PlanServiceImpl implements PlanService {
             return -1;
         Map<String,Object> params = Dict.create()
             .set("appkey",bo.getAppkey())
-            .set("vendorId",bo.getVendorId())
-            .set("vendorName",bo.getVendorName())
             .set("goodsId",bo.getGoodsId())
             .set("goodsImg",bo.getGoodsImg())
-            .set("goodsName",bo.getGoodsName())
-            .set("goodsLogo",bo.getGoodsLogo())
             .set("goodsIntroduce",bo.getGoodsIntroduce())
-            .set("goodsPrice",bo.getGoodsPrice())
+            .set("goodsLogo",bo.getGoodsLogo())
+            .set("goodsName",bo.getGoodsName())
             .set("goodsClassify",bo.getGoodsClassify())
-            .set("planStartTime",bo.getPlanStartTime())
-            .set("planEndTime",bo.getPlanEndTime())
+            .set("goodsPrice",bo.getGoodsPrice())
             .set("items",bo.getItems())
-            .set("sign",bo.getSign());
+            .set("planEndTime",bo.getPlanEndTime())
+            .set("planStartTime",bo.getPlanStartTime())
+            .set("sign",bo.getSign())
+            .set("vendorId",bo.getVendorId())
+            .set("vendorName",bo.getVendorName());
         if (!SignUtil.verify(params,app.getAppSecret()))
             return -3;
         // 插入广告计划

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

@@ -1,16 +1,21 @@
 package com.ruoyi.demo.service.impl;
 
+import cn.hutool.core.lang.Dict;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.ruoyi.demo.entity.App;
 import com.ruoyi.demo.entity.DlUser;
 import com.ruoyi.demo.entity.Statistics;
 import com.ruoyi.demo.entity.bo.PlanBo;
+import com.ruoyi.demo.entity.bo.StatisticsAddBo;
 import com.ruoyi.demo.entity.vo.PlanHomeVo;
 import com.ruoyi.demo.entity.vo.ScanListVo;
+import com.ruoyi.demo.mapper.AppMapper;
 import com.ruoyi.demo.mapper.DlUserMapper;
 import com.ruoyi.demo.mapper.StatisticsMapper;
 import com.ruoyi.demo.service.StatisticsService;
+import com.ruoyi.demo.utils.SignUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -19,6 +24,7 @@ import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 @Service
 @Transactional
@@ -27,6 +33,8 @@ public class StatisticsServiceImpl implements StatisticsService {
     StatisticsMapper statisticsMapper;
     @Autowired
     DlUserMapper dlUserMapper;
+    @Autowired
+    AppMapper appMapper;
 
     @Override
     public PageInfo<List<ScanListVo>> getScanList(PlanBo bo) {
@@ -53,7 +61,61 @@ public class StatisticsServiceImpl implements StatisticsService {
     }
 
     @Override
-    public int add(Statistics bo) {
+    public String getSign(StatisticsAddBo bo) {
+        QueryWrapper<App> appQueryWrapper = new QueryWrapper<>();
+        appQueryWrapper.eq("appkey",bo.getAppkey());
+        App app = appMapper.selectOne(appQueryWrapper);
+        if (app == null)
+            return "error";
+        Map<String,Object> params = Dict.create()
+            .set("addrInfo",bo.getAddrInfo())
+            .set("appkey",bo.getAppkey())
+            .set("behavior",bo.getBehavior())
+            .set("dealToolCount",bo.getDealToolCount())
+            .set("dealToolPrice",bo.getDealToolPrice())
+            .set("equipmentCode",bo.getEquipmentCode())
+            .set("equipmentId",bo.getEquipmentId())
+            .set("equipmentName",bo.getEquipmentName())
+            .set("goodsId",bo.getGoodsId())
+            .set("goodsName",bo.getGoodsName())
+            .set("planId",bo.getPlanId())
+            .set("planName",bo.getPlanName())
+            .set("time",bo.getTime())
+            .set("userId",bo.getUserId())
+            .set("userName",bo.getUserName())
+            .set("userTelephone",bo.getUserTelephone())
+            .set("sign",bo.getSign());
+        return SignUtil.sign(params,app.getAppSecret());
+    }
+
+    @Override
+    public int add(StatisticsAddBo bo) {
+        QueryWrapper<App> appQueryWrapper = new QueryWrapper<>();
+        appQueryWrapper.eq("appkey",bo.getAppkey());
+        App app = appMapper.selectOne(appQueryWrapper);
+        if (app == null)
+            return -1;
+        Map<String,Object> params = Dict.create()
+            .set("addrInfo",bo.getAddrInfo())
+            .set("appkey",bo.getAppkey())
+            .set("behavior",bo.getBehavior())
+            .set("dealToolCount",bo.getDealToolCount())
+            .set("dealToolPrice",bo.getDealToolPrice())
+            .set("equipmentCode",bo.getEquipmentCode())
+            .set("equipmentId",bo.getEquipmentId())
+            .set("equipmentName",bo.getEquipmentName())
+            .set("goodsId",bo.getGoodsId())
+            .set("goodsName",bo.getGoodsName())
+            .set("planId",bo.getPlanId())
+            .set("planName",bo.getPlanName())
+            .set("time",bo.getTime())
+            .set("userId",bo.getUserId())
+            .set("userName",bo.getUserName())
+            .set("userTelephone",bo.getUserTelephone())
+            .set("sign",bo.getSign());
+        if (!SignUtil.verify(params,app.getAppSecret()))
+            return -3;
+
         QueryWrapper<DlUser> userQueryWrapper = new QueryWrapper<>();
         userQueryWrapper.eq("user_id",bo.getUserId());
         DlUser user = dlUserMapper.selectOne(userQueryWrapper);