From c619972c50577bb699be6ee099b5e2741882fabb Mon Sep 17 00:00:00 2001 From: KKSU <15274802129@163.com> Date: Wed, 27 Dec 2023 16:15:59 +0800 Subject: [PATCH] 直推奖励,冻结的用户,则直推奖励销毁,用户未冻结才能领取成功 --- src/main/java/cc/mrbird/febs/mall/controller/ViewMallGoodsController.java | 67 +++++++++++++++++++++++++++++++++ 1 files changed, 67 insertions(+), 0 deletions(-) diff --git a/src/main/java/cc/mrbird/febs/mall/controller/ViewMallGoodsController.java b/src/main/java/cc/mrbird/febs/mall/controller/ViewMallGoodsController.java index 28f8fc8..489c406 100644 --- a/src/main/java/cc/mrbird/febs/mall/controller/ViewMallGoodsController.java +++ b/src/main/java/cc/mrbird/febs/mall/controller/ViewMallGoodsController.java @@ -6,6 +6,7 @@ import cc.mrbird.febs.common.enumerates.DataDictionaryEnum; import cc.mrbird.febs.common.utils.FebsUtil; import cc.mrbird.febs.mall.dto.ScoreSettingDto; +import cc.mrbird.febs.mall.dto.XcxSettingDto; import cc.mrbird.febs.mall.entity.DataDictionaryCustom; import cc.mrbird.febs.mall.entity.MallGoods; import cc.mrbird.febs.mall.mapper.DataDictionaryCustomMapper; @@ -45,6 +46,72 @@ return FebsUtil.view("modules/goods/goodsList"); } + + @GetMapping("xcxSetting") + @RequiresPermissions("xcxSetting:view") + public String xcxSetting(Model model) { + String appId = dataDictionaryCustomMapper.selectDicDataByTypeAndCode( + DataDictionaryEnum.XCX_APP_ID.getType(), + DataDictionaryEnum.XCX_APP_ID.getCode() + ).getValue(); + String mchId = dataDictionaryCustomMapper.selectDicDataByTypeAndCode( + DataDictionaryEnum.XCX_MCH_ID.getType(), + DataDictionaryEnum.XCX_MCH_ID.getCode() + ).getValue(); + String mchKey = dataDictionaryCustomMapper.selectDicDataByTypeAndCode( + DataDictionaryEnum.XCX_MCH_KEY.getType(), + DataDictionaryEnum.XCX_MCH_KEY.getCode() + ).getValue(); + String keyPath = dataDictionaryCustomMapper.selectDicDataByTypeAndCode( + DataDictionaryEnum.XCX_MCH_KEY_PATH_P12.getType(), + DataDictionaryEnum.XCX_MCH_KEY_PATH_P12.getCode() + ).getValue(); + String notifyUrl = dataDictionaryCustomMapper.selectDicDataByTypeAndCode( + DataDictionaryEnum.XCX_NOTICE_URL.getType(), + DataDictionaryEnum.XCX_NOTICE_URL.getCode() + ).getValue(); + XcxSettingDto xcxSettingDto = new XcxSettingDto(); + xcxSettingDto.setAppId(appId); + xcxSettingDto.setMchId(mchId); + xcxSettingDto.setMchKey(mchKey); + xcxSettingDto.setKeyPath(keyPath); + xcxSettingDto.setNotifyUrl(notifyUrl); + model.addAttribute("xcxSetting", xcxSettingDto); + return FebsUtil.view("modules/goods/xcxSetting"); + } + + /** + * app商品列表 + * @return + */ + @GetMapping("goodsAppList") + @RequiresPermissions("goodsAppList:view") + public String goodsAppList() { + return FebsUtil.view("modules/goods/goodsAppList"); + } + /** + * app商品-新增 + * @return + */ + @GetMapping("goodsAppAddNew") + @RequiresPermissions("goodsAppAddNew:add") + public String goodsAppAddNew() { + return FebsUtil.view("modules/goods/goodsAppAddNew"); + } + /** + * app商品-编辑-详情 + * @param id + * @param model + * @return + */ + @GetMapping("goodsAppUpdateNew/{id}") + @RequiresPermissions("goodsAppUpdateNew:update") + public String goodsAppUpdateNew(@PathVariable long id, Model model) { + MallGoods data = mallGoodsService.selectGoodsById(id); + model.addAttribute("goodsInfo", data); + return FebsUtil.view("modules/goods/goodsAppUpdateNew"); + } + /** * 商品-新增 * @return -- Gitblit v1.9.1