blame | history | patch | commit | commitdiff | ignore whitespace
935090232@qq.com
2022-02-22 bbe0a2fd03063316e50cf141986bda984599bbda 
 zq-erp/src/main/java/com/matrix/system/fenxiao/action/FenXiaoSettingAction.java


@@ -2,7 +2,7 @@




import cn.hutool.core.collection.CollUtil;


import cn.hutool.core.util.StrUtil;


import com.matrix.biz.dao.BizUserDao;


import com.matrix.system.hive.dao.SysVipInfoDao;


import com.matrix.core.constance.MatrixConstance;


import com.matrix.core.pojo.AjaxResult;


import com.matrix.core.pojo.PaginationVO;


@@ -15,11 +15,9 @@


import com.matrix.system.fenxiao.service.FenXiaoSettingService;


import com.matrix.system.fenxiao.vo.FenXiaoSettingVo;


import com.matrix.system.hive.action.util.QueryUtil;


import com.matrix.system.hive.bean.ShoppingGoods;


import com.matrix.system.hive.dao.ShoppingGoodsDao;


import com.matrix.system.shopXcx.bean.ShopProduct;


import com.matrix.system.shopXcx.dao.ShopProductDao;




import org.springframework.beans.BeanUtils;


import org.springframework.beans.factory.annotation.Autowired;


import org.springframework.web.bind.annotation.*;


@@ -42,7 +40,7 @@


    private ShoppingGoodsDao shoppingGoodsDao;


    


    @Autowired


    private BizUserDao bizUserDao;


    private SysVipInfoDao sysVipInfoDao;


    


    @Autowired


    private ShopProductDao shopProductDao;


@@ -62,6 +60,12 @@


       String[] FXKGName={"分销开关"};


       List<FenXiaoSettingVo> fxkgRuleSettingsVo = getRuleSettingsVo(FXKGCode,FXKGName,companyId);


       result.putInMap("fxkg", fxkgRuleSettingsVo);


       //自购返佣


       String[] ZGFYCode={FenxiaoSettingConstant.FX_ZGFY};


       String[] ZGFYName={"自购返佣"};


       List<FenXiaoSettingVo> zgfyRuleSettingsVo = getRuleSettingsVo(ZGFYCode,ZGFYName,companyId);


       result.putInMap("zgfy", zgfyRuleSettingsVo);




       //分销模式


       String[] FXMSCode={FenxiaoSettingConstant.FX_MODEL};


       String[] FXMSName={"分销模式"};


@@ -96,10 +100,14 @@


                         idsList.add(parseInt);


                      }


                   }


                   List<ShoppingGoods> list = shoppingGoodsDao.selectByIds(idsList);


                   result.putInMap("order", list);


                   //List<ShoppingGoods> list = shoppingGoodsDao.selectByIds(idsList);


                       List<ShopProduct> shopProducts = shopProductDao.selectByIds(idsList);


                       result.putInMap("order", shopProducts);


                }


             }


             }else{


                   List<ShopProduct> shopProducts = new ArrayList<>();


                   result.putInMap("order", shopProducts);


               }


          }


       }


       return result;