修改前端传值商户Id问题

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

@@ -93,8 +93,6 @@ public class PlanController {
             return R.ok("广告添加成功");
         if (i == -1)
             return R.fail("无效的appkey");
-        if (i == -2)
-            return R.fail("无效商户");
         if (i == -3)
             return R.fail("校验sign出错");
         return R.fail("广告添加失败");

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

@@ -76,9 +76,9 @@ public class Plan {
     private int deleted;
 
     public Plan(){}
-    public Plan(Commercial commercial, App app, PlanAddBo bo){
-        this.setCommercialId(commercial.getCommercialId());
-        this.setCommercialName(commercial.getCommercialName());
+    public Plan(App app, PlanAddBo bo){
+        this.setCommercialId(app.getCommercialId());
+        this.setCommercialName(app.getCommercialName());
         this.setAppkey(app.getAppkey());
         this.setAppName(app.getAppName());
 

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

@@ -15,7 +15,6 @@ public class PlanAddBo {
     private String planName;
 
     private String appkey;
-    private String commercialId;
     private String goodsId;
     private String goodsImg;
     private String goodsName;

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

@@ -54,14 +54,8 @@ public class PlanServiceImpl implements PlanService {
         App app = appMapper.selectOne(appQueryWrapper);
         if (app == null)
             return -1;
-        QueryWrapper<Commercial> commercialQueryWrapper = new QueryWrapper<>();
-        commercialQueryWrapper.eq("commercial_id",bo.getCommercialId());
-        Commercial commercial = commercialMapper.selectOne(commercialQueryWrapper);
-        if (commercial == null)
-            return -2;
         Map<String,Object> params = Dict.create()
             .set("appkey",bo.getAppkey())
-            .set("commercialId",bo.getCommercialId())
             .set("goodsId",bo.getGoodsId())
             .set("goodsImg",bo.getGoodsImg())
             .set("goodsName",bo.getGoodsName())
@@ -76,7 +70,7 @@ public class PlanServiceImpl implements PlanService {
         if (!SignUtil.verify(params,app.getAppSecret()))
             return -3;
         // 插入广告计划
-        Plan plan = new Plan(commercial,app,bo);
+        Plan plan = new Plan(app,bo);
         planMapper.insert(plan);
         // 插入广告计划明细
         for (PlanItemAddBo itemAddBo : bo.getItems()) {