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

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

@@ -5,6 +5,7 @@ import lombok.Data;
 @Data
 public class GoodsBo {
     private String appkey;
+    private String vendorId;
     private String goodsId;
     private String goodsName;
     private String goodsClassify;

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

@@ -8,5 +8,6 @@ import java.util.List;
 public class GoodsDeleteBo {
 //    private List<GoodsBo> deleteItems;
     private String appkey;
+    private String vendorId;
     private String goodsId;
 }

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

@@ -15,6 +15,10 @@ public class PlanAddBo {
     private String planName;
 
     private String appkey;
+
+    private String vendorId;
+    private String vendorName;
+
     private String goodsId;
     private String goodsImg;
     private String goodsName;

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

@@ -6,6 +6,10 @@ import lombok.Data;
 @Data
 public class GoodsListVo {
     private String appkey;
+
+    private String appName;
+    private String vendorName;
+
     private String goodsId;
     private String goodsImg;
     private String goodsName;
@@ -15,6 +19,10 @@ public class GoodsListVo {
     public GoodsListVo(){}
     public GoodsListVo(Goods goods){
         this.appkey = goods.getAppkey();
+
+        this.appName = goods.getAppName();
+        this.vendorName = goods.getVendorName();
+
         this.goodsId = goods.getGoodsId();
         this.goodsImg = goods.getGoodsId();
         this.goodsName = goods.getGoodsName();

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

@@ -11,6 +11,7 @@ import com.ruoyi.demo.entity.vo.*;
 import java.util.List;
 
 public interface PlanService {
+    String getSign(PlanAddBo bo);
     int addPlan(PlanAddBo bo);
     int deletePlan(String id);
     int deletePlans(List<String> ids);

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

@@ -32,6 +32,7 @@ public class GoodsServiceImpl implements GoodsService {
         QueryWrapper<Goods> goodsQueryWrapper = new QueryWrapper<>();
         goodsQueryWrapper.eq("appkey",goods.getAppkey());
         goodsQueryWrapper.eq("goods_id",goods.getGoodsId());
+        goodsQueryWrapper.eq("vendor_id",goods.getVendorId());
         Goods one = goodsMapper.selectOne(goodsQueryWrapper);
         if (one != null)
             return 2;
@@ -44,6 +45,7 @@ public class GoodsServiceImpl implements GoodsService {
         QueryWrapper<Goods> goodsQueryWrapper = new QueryWrapper<>();
         goodsQueryWrapper.eq("appkey",bo.getAppkey());
         goodsQueryWrapper.eq("goods_id",bo.getGoodsId());
+        goodsQueryWrapper.eq("vendor_id",bo.getVendorId());
         return goodsMapper.delete(goodsQueryWrapper);
     }
 
@@ -67,6 +69,7 @@ public class GoodsServiceImpl implements GoodsService {
         QueryWrapper<Goods> goodsQueryWrapper = new QueryWrapper<>();
         goodsQueryWrapper.eq("appkey",bo.getAppkey());
         goodsQueryWrapper.eq("goods_id",bo.getGoodsId());
+        goodsQueryWrapper.eq("vendor_id",bo.getVendorId());
         Goods goods = goodsMapper.selectOne(goodsQueryWrapper);
         return new GoodsDetailVo(goods);
     }
@@ -76,6 +79,7 @@ public class GoodsServiceImpl implements GoodsService {
         QueryWrapper<Goods> goodsQueryWrapper = new QueryWrapper<>();
         goodsQueryWrapper.eq("appkey",goods.getAppkey());
         goodsQueryWrapper.eq("goods_id",goods.getGoodsId());
+        goodsQueryWrapper.eq("vendor_id",goods.getVendorId());
         return goodsMapper.update(goods,goodsQueryWrapper);
     }
 }

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

@@ -52,6 +52,32 @@ public class PlanServiceImpl implements PlanService {
 //    @Autowired
 //    SysUserMapper sysUserMapper;
 
+    @Override
+    public String getSign(PlanAddBo bo) {
+        QueryWrapper<App> appQueryWrapper = new QueryWrapper<>();
+        appQueryWrapper.eq("appkey",bo.getAppkey());
+        appQueryWrapper.eq("deleted","0");
+        App app = appMapper.selectOne(appQueryWrapper);
+        if (app == null)
+            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("goodsClassify",bo.getGoodsClassify())
+            .set("planStartTime",bo.getPlanStartTime())
+            .set("planEndTime",bo.getPlanEndTime())
+            .set("items",bo.getItems())
+            .set("sign",null);
+        return SignUtil.sign(params,app.getAppSecret());
+    }
+
     @Override
     public int addPlan(PlanAddBo bo) {
         QueryWrapper<App> appQueryWrapper = new QueryWrapper<>();
@@ -62,6 +88,8 @@ 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())
@@ -87,6 +115,7 @@ public class PlanServiceImpl implements PlanService {
         QueryWrapper<Goods> goodsQueryWrapper = new QueryWrapper<>();
         goodsQueryWrapper.eq("appkey",bo.getAppkey());
         goodsQueryWrapper.eq("goods_id",bo.getGoodsId());
+        goodsQueryWrapper.eq("vendor_id",bo.getVendorId());
         Goods query = goodsMapper.selectOne(goodsQueryWrapper);
         if (query == null){
             Goods goods = new Goods(plan);