fix

zhongzheng-admin/src/main/java/com/zhongzheng/controller/common/CommonController.java

@@ -10,7 +10,9 @@ import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.zhongzheng.common.annotation.Log;
 import com.zhongzheng.common.config.RuoYiConfig;
 import com.zhongzheng.common.constant.Constants;
+import com.zhongzheng.common.core.controller.BaseController;
 import com.zhongzheng.common.core.domain.AjaxResult;
+import com.zhongzheng.common.core.page.TableDataInfo;
 import com.zhongzheng.common.enums.BusinessType;
 import com.zhongzheng.common.type.EncryptHandler;
 import com.zhongzheng.common.utils.ServletUtils;
@@ -20,10 +22,15 @@ import com.zhongzheng.common.utils.file.FileUtils;
 import com.zhongzheng.common.utils.poi.ExcelUtil;
 import com.zhongzheng.framework.config.ServerConfig;
 import com.zhongzheng.framework.web.service.WxLoginService;
+import com.zhongzheng.modules.activity.vo.ActivityGoodsPriceVo;
 import com.zhongzheng.modules.base.bo.ConfigQueryBo;
+import com.zhongzheng.modules.distribution.bo.DistributionActivityGoodsQueryBo;
 import com.zhongzheng.modules.distribution.bo.DistributionCashWithdrawalPayBo;
 import com.zhongzheng.modules.distribution.bo.DistributionCheckQueryBo;
+import com.zhongzheng.modules.distribution.service.IDistributionActivityGoodsService;
 import com.zhongzheng.modules.distribution.service.IDistributionCashWithdrawalService;
+import com.zhongzheng.modules.distribution.service.IDistributionSellerService;
+import com.zhongzheng.modules.distribution.vo.DistributionSellerVo;
 import com.zhongzheng.modules.goods.bo.GoodsQueryBo;
 import com.zhongzheng.modules.goods.bo.GoodsStudyUrlBo;
 import com.zhongzheng.modules.goods.bo.UserGoodsListBo;
@@ -76,7 +83,7 @@ import java.util.stream.Collectors;
  * @author zhongzheng
  */
 @RestController
-public class CommonController
+public class CommonController extends BaseController
 {
     private static final Logger log = LoggerFactory.getLogger(CommonController.class);
 
@@ -112,6 +119,10 @@ public class CommonController
     private ISysConfigService configService;
     @Autowired
     private IDistributionCashWithdrawalService iDistributionCashWithdrawalService;
+    @Autowired
+    private  IDistributionSellerService iDistributionSellerService;
+    @Autowired
+    private  IDistributionActivityGoodsService iDistributionActivityGoodsService;
     /**
      * 通用下载请求
      *
@@ -471,4 +482,25 @@ public class CommonController
     }
 
 
+    @ApiOperation("通过分享code查询业务员用户信息")
+    @GetMapping("app/common/distribution/getInfoByShareCode")
+    public AjaxResult<DistributionSellerVo> getInfoByShareCode(String shareCode)
+    {
+        DistributionSellerVo vo = iDistributionSellerService.queryByShareCode(shareCode);
+        vo.setNull();
+        String jsonStr = configService.selectConfigByKey("home.header");
+        JSONObject objectJson = JSON.parseObject(jsonStr);
+        vo.setTenantName(String.valueOf(objectJson.get("companyName")));
+        return AjaxResult.success(vo);
+    }
+
+
+    @ApiOperation("获取分销活动商品列表")
+    @GetMapping("app/common/distribution/getGoodsList")
+    public TableDataInfo<ActivityGoodsPriceVo> distributionGoodsList(DistributionActivityGoodsQueryBo bo)
+    {
+        startPage();
+        List<ActivityGoodsPriceVo> list = iDistributionActivityGoodsService.getGoodsList(bo);
+        return getDataTable(list);
+    }
 }