From 03d57416d51b7a5898d6c77029b840704352b02a Mon Sep 17 00:00:00 2001 From: zhangheng Date: Mon, 13 Oct 2025 17:21:39 +0800 Subject: [PATCH] =?UTF-8?q?##=20=E5=8A=A0=E8=B4=AD=E5=8D=87=E7=BA=A7?= =?UTF-8?q?=E5=8A=9F=E8=83=BD,=E6=8A=A5=E5=8D=95=E8=B5=A0=E9=80=81?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../manage/AcAddUpgradeConfigController.java | 19 --- .../manage/AcAddUpgradeRecordController.java | 42 ++++++- .../add/mapper/AcAddUpgradeRecordMapper.java | 5 + .../activity/add/param/AcAddUpgradeParam.java | 5 - .../service/IAcAddUpgradeConfigService.java | 2 - .../service/IAcAddUpgradeRecordService.java | 5 + .../impl/AcAddUpgradeConfigServiceImpl.java | 14 --- .../impl/AcAddUpgradeRecordServiceImpl.java | 9 ++ .../activity/add/vo/AcAddUpgradeListVO.java | 5 - .../AcDeclarationGiftConfigController.java | 63 ++++++---- .../AcDeclarationGiftRecordController.java | 41 ++++++- .../mapper/AcDeclarationGiftRecordMapper.java | 6 + .../param/AcDeclarationListParam.java | 42 +++++++ .../declaration/param/AcDeclarationParam.java | 4 - .../IAcDeclarationGiftConfigService.java | 8 +- .../IAcDeclarationGiftRecordService.java | 6 + .../AcDeclarationGiftConfigServiceImpl.java | 109 ++++++++---------- .../AcDeclarationGiftRecordServiceImpl.java | 10 ++ .../declaration/vo/AcDeclarationListVO.java | 65 +++++++++++ .../activity/add/AcAddUpgradeRecordMapper.xml | 37 ++++++ .../AcDeclarationGiftRecordMapper.xml | 37 ++++++ .../common/core/enums/EOperationBusiness.java | 5 +- .../common/core/enums/EOperationModule.java | 5 +- 23 files changed, 406 insertions(+), 138 deletions(-) create mode 100644 bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/param/AcDeclarationListParam.java create mode 100644 bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/vo/AcDeclarationListVO.java diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/add/controller/manage/AcAddUpgradeConfigController.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/add/controller/manage/AcAddUpgradeConfigController.java index 05c55fd3..7e88b163 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/add/controller/manage/AcAddUpgradeConfigController.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/add/controller/manage/AcAddUpgradeConfigController.java @@ -90,24 +90,5 @@ public class AcAddUpgradeConfigController extends BaseController { ExcelUtil util = new ExcelUtil<>(BaseConfigVo.class); util.exportExcel(response, resultList, "加购升级导出"); } - /** - * - * @param param - * @return - */ - @Log(module = EOperationModule.AC_ADD_UPGRADE_LIST, business = EOperationBusiness.AC_ADD_UPGRADE_LIST, method = EOperationMethod.SELECT) - @GetMapping("/list") - public TableDataInfo directPushUpgradeList(AcAddUpgradeListParam param) { - startPage(); - return getDataTable(iAcAddUpgradeConfigService.queryList(param)); - } - @Log(module = EOperationModule.AC_ADD_UPGRADE_LIST_EXPORT, business = EOperationBusiness.AC_ADD_UPGRADE_LIST_EXPORT, method = EOperationMethod.SELECT) - @PostMapping("/listExport") - public void export(AcAddUpgradeListParam param, HttpServletResponse response) { - startPage(); - List list = iAcAddUpgradeConfigService.queryList(param); - ExcelUtil util = new ExcelUtil<>(AcAddUpgradeListVO.class); - util.exportExcel(response, list, "加购升级数据导出"); - } } diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/add/controller/manage/AcAddUpgradeRecordController.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/add/controller/manage/AcAddUpgradeRecordController.java index 13e40f0e..7da56a19 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/add/controller/manage/AcAddUpgradeRecordController.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/add/controller/manage/AcAddUpgradeRecordController.java @@ -1,10 +1,27 @@ package com.hzs.activity.add.controller.manage; +import com.hzs.activity.add.param.AcAddUpgradeListParam; +import com.hzs.activity.add.service.IAcAddUpgradeConfigService; +import com.hzs.activity.add.service.IAcAddUpgradeRecordService; +import com.hzs.activity.add.vo.AcAddUpgradeListVO; +import com.hzs.common.core.annotation.Log; +import com.hzs.common.core.enums.EOperationBusiness; +import com.hzs.common.core.enums.EOperationMethod; +import com.hzs.common.core.enums.EOperationModule; +import com.hzs.common.core.utils.poi.ExcelUtil; +import com.hzs.common.core.web.controller.BaseController; +import com.hzs.common.core.web.page.TableDataInfo; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import javax.servlet.http.HttpServletResponse; +import java.util.List; + /** *

* 加购活动明细表 前端控制器 @@ -15,6 +32,29 @@ import org.springframework.web.bind.annotation.RestController; */ @RestController @RequestMapping("/manage/addUpgradeRecord") -public class AcAddUpgradeRecordController { +public class AcAddUpgradeRecordController extends BaseController { + + @Autowired + private IAcAddUpgradeRecordService acAddUpgradeRecordService; + /** + * + * @param param + * @return + */ + @Log(module = EOperationModule.AC_ADD_UPGRADE_LIST, business = EOperationBusiness.AC_ADD_UPGRADE_LIST, method = EOperationMethod.SELECT) + @GetMapping("/list") + public TableDataInfo directPushUpgradeList(AcAddUpgradeListParam param) { + startPage(); + return getDataTable(acAddUpgradeRecordService.queryList(param)); + } + + @Log(module = EOperationModule.AC_ADD_UPGRADE_LIST_EXPORT, business = EOperationBusiness.AC_ADD_UPGRADE_LIST_EXPORT, method = EOperationMethod.SELECT) + @PostMapping("/listExport") + public void export(AcAddUpgradeListParam param, HttpServletResponse response) { + startPage(); + List list = acAddUpgradeRecordService.queryList(param); + ExcelUtil util = new ExcelUtil<>(AcAddUpgradeListVO.class); + util.exportExcel(response, list, "加购升级数据导出"); + } } diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/add/mapper/AcAddUpgradeRecordMapper.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/add/mapper/AcAddUpgradeRecordMapper.java index d27af084..ecabc47e 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/add/mapper/AcAddUpgradeRecordMapper.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/add/mapper/AcAddUpgradeRecordMapper.java @@ -1,8 +1,12 @@ package com.hzs.activity.add.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.hzs.activity.add.param.AcAddUpgradeListParam; +import com.hzs.activity.add.vo.AcAddUpgradeListVO; import com.hzs.activity.add.vo.AcAddUpgradeRecord; +import java.util.List; + /** *

* 加购活动明细表 Mapper 接口 @@ -13,4 +17,5 @@ import com.hzs.activity.add.vo.AcAddUpgradeRecord; */ public interface AcAddUpgradeRecordMapper extends BaseMapper { + List queryList(AcAddUpgradeListParam param); } diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/add/param/AcAddUpgradeParam.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/add/param/AcAddUpgradeParam.java index daa8654d..97e4b6d1 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/add/param/AcAddUpgradeParam.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/add/param/AcAddUpgradeParam.java @@ -54,10 +54,5 @@ public class AcAddUpgradeParam implements Serializable { */ private List acAddUpgradeConfigParam; - /** - * 权限配置列表 - */ - private List authorityList; - } diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/add/service/IAcAddUpgradeConfigService.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/add/service/IAcAddUpgradeConfigService.java index 8c8b5a9d..38a7de47 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/add/service/IAcAddUpgradeConfigService.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/add/service/IAcAddUpgradeConfigService.java @@ -22,6 +22,4 @@ public interface IAcAddUpgradeConfigService extends IService String onLinePetition(AcAddUpgradeParam acAddUpgradeParam); AjaxResult getDetail(Integer pkId); - - List queryList(AcAddUpgradeListParam param); } diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/add/service/IAcAddUpgradeRecordService.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/add/service/IAcAddUpgradeRecordService.java index b6a5fab2..623f3419 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/add/service/IAcAddUpgradeRecordService.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/add/service/IAcAddUpgradeRecordService.java @@ -1,8 +1,12 @@ package com.hzs.activity.add.service; import com.baomidou.mybatisplus.extension.service.IService; +import com.hzs.activity.add.param.AcAddUpgradeListParam; +import com.hzs.activity.add.vo.AcAddUpgradeListVO; import com.hzs.activity.add.vo.AcAddUpgradeRecord; +import java.util.List; + /** *

* 加购活动明细表 服务类 @@ -13,4 +17,5 @@ import com.hzs.activity.add.vo.AcAddUpgradeRecord; */ public interface IAcAddUpgradeRecordService extends IService { + List queryList(AcAddUpgradeListParam param); } diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/add/service/impl/AcAddUpgradeConfigServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/add/service/impl/AcAddUpgradeConfigServiceImpl.java index 8a5bf769..bced1642 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/add/service/impl/AcAddUpgradeConfigServiceImpl.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/add/service/impl/AcAddUpgradeConfigServiceImpl.java @@ -74,8 +74,6 @@ public class AcAddUpgradeConfigServiceImpl extends ServiceImpl queryList(AcAddUpgradeListParam param) { - return baseMapper.queryList(param); - } private void removeAddUpgradeConfig(Long pkId) { // 删除活动基本配置 @@ -132,9 +126,6 @@ public class AcAddUpgradeConfigServiceImpl extends ServiceImpl() .eq(AcAddUpgradeConfig::getPkBaseId, pkId)); - // 删除用户权限配置 - iAcGoalMemberConfigService.remove(new LambdaQueryWrapper() - .eq(AcGoalMemberConfig::getPkBaseId, pkId)); } private void updateAddUpgradeConfig(ActivityParam activityParam, List acAddUpgradeConfigParam) { @@ -148,13 +139,8 @@ public class AcAddUpgradeConfigServiceImpl extends ServiceImpl() .eq(AcAddUpgradeConfig::getPkBaseId, pkId)); - // 删除用户权限配置 - iAcGoalMemberConfigService.remove(new LambdaQueryWrapper() - .eq(AcGoalMemberConfig::getPkBaseId, pkId)); // 添加加购活动配置 saveAddUpgradeConfig(acAddUpgradeConfigParam,baseConfig); - // 添加用户权限配置 - iActivityService.saveGoalMemberConfig(activityParam, baseConfig); } } diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/add/service/impl/AcAddUpgradeRecordServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/add/service/impl/AcAddUpgradeRecordServiceImpl.java index 449eea07..2faa4d57 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/add/service/impl/AcAddUpgradeRecordServiceImpl.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/add/service/impl/AcAddUpgradeRecordServiceImpl.java @@ -2,10 +2,15 @@ package com.hzs.activity.add.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.hzs.activity.add.mapper.AcAddUpgradeRecordMapper; +import com.hzs.activity.add.param.AcAddUpgradeListParam; import com.hzs.activity.add.service.IAcAddUpgradeRecordService; +import com.hzs.activity.add.vo.AcAddUpgradeListVO; import com.hzs.activity.add.vo.AcAddUpgradeRecord; import org.springframework.stereotype.Service; +import java.util.Collections; +import java.util.List; + /** *

* 加购活动明细表 服务实现类 @@ -17,4 +22,8 @@ import org.springframework.stereotype.Service; @Service public class AcAddUpgradeRecordServiceImpl extends ServiceImpl implements IAcAddUpgradeRecordService { + @Override + public List queryList(AcAddUpgradeListParam param) { + return baseMapper.queryList(param); + } } diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/add/vo/AcAddUpgradeListVO.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/add/vo/AcAddUpgradeListVO.java index 4a6ac102..b1aca750 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/add/vo/AcAddUpgradeListVO.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/add/vo/AcAddUpgradeListVO.java @@ -62,10 +62,5 @@ public class AcAddUpgradeListVO { @JsonFormat(pattern = "yyyy-MM-dd") private Date creationTime; - /** - * 升级年月 - */ - @Excel(name = "升级年月", dateFormat = "yyyy-MM-dd") - private String upgradeTime; } diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/controller/manage/AcDeclarationGiftConfigController.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/controller/manage/AcDeclarationGiftConfigController.java index 19da1a0c..febafbbe 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/controller/manage/AcDeclarationGiftConfigController.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/controller/manage/AcDeclarationGiftConfigController.java @@ -48,13 +48,48 @@ public class AcDeclarationGiftConfigController extends BaseController { * @param acDeclarationParam 报单赠送活动 * @return AjaxResult */ - @Log(module = EOperationModule.AC_DECLARATION_GIFT_SUBMIT, business = EOperationBusiness.AC_DECLARATION_GIFT_SUBMIT, method = EOperationMethod.INSERT, remark = "加购活动") - @PostMapping("/submit") - public AjaxResult onLinePetition(@RequestBody AcDeclarationParam acDeclarationParam) { + @Log(module = EOperationModule.AC_DECLARATION_GIFT_SAVE, business = EOperationBusiness.AC_DECLARATION_GIFT_SAVE, method = EOperationMethod.INSERT, remark = "报单赠送添加") + @PostMapping("/save") + public AjaxResult declarationConfigSave(@RequestBody AcDeclarationParam acDeclarationParam) { acDeclarationParam.setPkCountry(SecurityUtils.getPkCountry()); acDeclarationParam.setPkMember(SecurityUtils.getUserId()); acDeclarationParam.setLoginUser(userTokenService.getLoginUser()); - String str = iAcDeclarationGiftConfigService.onLinePetition(acDeclarationParam); + String str = iAcDeclarationGiftConfigService.saveConfig(acDeclarationParam); + if (str != null) { + return AjaxResult.error(str); + } + return AjaxResult.success(); + } + /** + * + * 报单赠送活动更新 + * @param acDeclarationParam 报单赠送更新 + * @return AjaxResult + */ + @Log(module = EOperationModule.AC_DECLARATION_GIFT_UPDATE, business = EOperationBusiness.AC_DECLARATION_GIFT_UPDATE, method = EOperationMethod.UPDATE, remark = "报单赠送修改") + @PostMapping("/update") + public AjaxResult declarationConfigUpdate(@RequestBody AcDeclarationParam acDeclarationParam) { + acDeclarationParam.setPkCountry(SecurityUtils.getPkCountry()); + acDeclarationParam.setPkMember(SecurityUtils.getUserId()); + acDeclarationParam.setLoginUser(userTokenService.getLoginUser()); + String str = iAcDeclarationGiftConfigService.updateConfig(acDeclarationParam); + if (str != null) { + return AjaxResult.error(str); + } + return AjaxResult.success(); + } + + + /** + * + * 报单赠送活动删除 + * @param pkId 报单赠送删除 + * @return AjaxResult + */ + @Log(module = EOperationModule.AC_DECLARATION_GIFT_DELETE, business = EOperationBusiness.AC_DECLARATION_GIFT_DELETE, method = EOperationMethod.DELETE, remark = "报单赠送删除") + @PostMapping("/delete") + public AjaxResult declarationConfigDelete(@RequestBody Long pkId) { + String str = iAcDeclarationGiftConfigService.deleteConfig(pkId); if (str != null) { return AjaxResult.error(str); } @@ -86,24 +121,4 @@ public class AcDeclarationGiftConfigController extends BaseController { util.exportExcel(response, resultList, "报单赠送导出"); } - /** - * - * @param param - * @return - */ -// @Log(module = EOperationModule.AC_DECLARATION_GIFT_LIST, business = EOperationBusiness.AC_DECLARATION_GIFT_LIST, method = EOperationMethod.SELECT) -// @GetMapping("/list") -// public TableDataInfo directPushUpgradeList(AcAddUpgradeListParam param) { -// startPage(); -// return getDataTable(iAcDeclarationGiftConfigService.queryList(param)); -// } -// -// @Log(module = EOperationModule.AC_DECLARATION_GIFT_LIST_EXPORT, business = EOperationBusiness.AC_DECLARATION_GIFT_LIST_EXPORT, method = EOperationMethod.SELECT) -// @PostMapping("/listExport") -// public void export(AcAddUpgradeListParam param, HttpServletResponse response) { -// startPage(); -// List list = iAcDeclarationGiftConfigService.queryList(param); -// ExcelUtil util = new ExcelUtil<>(AcAddUpgradeListVO.class); -// util.exportExcel(response, list, "加购升级数据导出"); -// } } diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/controller/manage/AcDeclarationGiftRecordController.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/controller/manage/AcDeclarationGiftRecordController.java index a48c1244..1bddc472 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/controller/manage/AcDeclarationGiftRecordController.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/controller/manage/AcDeclarationGiftRecordController.java @@ -1,10 +1,27 @@ package com.hzs.activity.declaration.controller.manage; +import com.hzs.activity.add.param.AcAddUpgradeListParam; +import com.hzs.activity.declaration.param.AcDeclarationListParam; +import com.hzs.activity.declaration.service.IAcDeclarationGiftRecordService; +import com.hzs.activity.declaration.vo.AcDeclarationListVO; +import com.hzs.common.core.annotation.Log; +import com.hzs.common.core.enums.EOperationBusiness; +import com.hzs.common.core.enums.EOperationMethod; +import com.hzs.common.core.enums.EOperationModule; +import com.hzs.common.core.utils.poi.ExcelUtil; +import com.hzs.common.core.web.controller.BaseController; +import com.hzs.common.core.web.page.TableDataInfo; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import javax.servlet.http.HttpServletResponse; +import java.util.List; + /** *

* 报单赠品明细表 前端控制器 @@ -15,6 +32,28 @@ import org.springframework.web.bind.annotation.RestController; */ @RestController @RequestMapping("/manage/acDeclarationRecord") -public class AcDeclarationGiftRecordController { +public class AcDeclarationGiftRecordController extends BaseController { + @Autowired + private IAcDeclarationGiftRecordService acDeclarationGiftRecordService; + /** + * + * @param param + * @return + */ + @Log(module = EOperationModule.AC_DECLARATION_GIFT_LIST, business = EOperationBusiness.AC_DECLARATION_GIFT_LIST, method = EOperationMethod.SELECT) + @GetMapping("/list") + public TableDataInfo directPushUpgradeList(AcDeclarationListParam param) { + startPage(); + return getDataTable(acDeclarationGiftRecordService.queryList(param)); + } + + @Log(module = EOperationModule.AC_DECLARATION_GIFT_LIST_EXPORT, business = EOperationBusiness.AC_DECLARATION_GIFT_LIST_EXPORT, method = EOperationMethod.SELECT) + @PostMapping("/listExport") + public void export(AcDeclarationListParam param, HttpServletResponse response) { + startPage(); + List list = acDeclarationGiftRecordService.queryList(param); + ExcelUtil util = new ExcelUtil<>(AcDeclarationListVO.class); + util.exportExcel(response, list, "报单赠送数据导出"); + } } diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/mapper/AcDeclarationGiftRecordMapper.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/mapper/AcDeclarationGiftRecordMapper.java index bc7b4208..941331a9 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/mapper/AcDeclarationGiftRecordMapper.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/mapper/AcDeclarationGiftRecordMapper.java @@ -1,7 +1,12 @@ package com.hzs.activity.declaration.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.hzs.activity.add.param.AcAddUpgradeListParam; +import com.hzs.activity.declaration.param.AcDeclarationListParam; import com.hzs.activity.declaration.vo.AcDeclarationGiftRecord; +import com.hzs.activity.declaration.vo.AcDeclarationListVO; + +import java.util.List; /** *

@@ -13,4 +18,5 @@ import com.hzs.activity.declaration.vo.AcDeclarationGiftRecord; */ public interface AcDeclarationGiftRecordMapper extends BaseMapper { + List queryList(AcDeclarationListParam param); } diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/param/AcDeclarationListParam.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/param/AcDeclarationListParam.java new file mode 100644 index 00000000..6fce8b15 --- /dev/null +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/param/AcDeclarationListParam.java @@ -0,0 +1,42 @@ +package com.hzs.activity.declaration.param; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@AllArgsConstructor +@NoArgsConstructor +public class AcDeclarationListParam { + + /** + * 活动名称 + */ + private String actName; + + /** + * 会员编号 + */ + private String memberCode; + + + /** + * 开始活动开始时间 + */ + private String startActStartDate; + + /** + * 开始活动结束时间 + */ + private String startActEndDate; + + /** + * 结束活动开始时间 + */ + private String endActStartDate; + + /** + * 结束活动结束时间 + */ + private String endActEndDate; +} diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/param/AcDeclarationParam.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/param/AcDeclarationParam.java index 03674420..2e0cbf09 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/param/AcDeclarationParam.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/param/AcDeclarationParam.java @@ -50,9 +50,5 @@ public class AcDeclarationParam { */ private List acDeclarationConfigParams; - /** - * 权限配置列表 - */ - private List authorityList; } diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/service/IAcDeclarationGiftConfigService.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/service/IAcDeclarationGiftConfigService.java index a0e8f91e..d5453662 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/service/IAcDeclarationGiftConfigService.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/service/IAcDeclarationGiftConfigService.java @@ -17,7 +17,11 @@ import com.hzs.common.core.web.domain.AjaxResult; public interface IAcDeclarationGiftConfigService extends IService { - String onLinePetition(AcDeclarationParam acDeclarationParam); - AjaxResult getDetail(Integer pkId); + + String saveConfig(AcDeclarationParam acDeclarationParam); + + String updateConfig(AcDeclarationParam acDeclarationParam); + + String deleteConfig(Long pkId); } diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/service/IAcDeclarationGiftRecordService.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/service/IAcDeclarationGiftRecordService.java index 0018ac6c..a4ca2b99 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/service/IAcDeclarationGiftRecordService.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/service/IAcDeclarationGiftRecordService.java @@ -1,7 +1,12 @@ package com.hzs.activity.declaration.service; import com.baomidou.mybatisplus.extension.service.IService; +import com.hzs.activity.add.param.AcAddUpgradeListParam; +import com.hzs.activity.declaration.param.AcDeclarationListParam; import com.hzs.activity.declaration.vo.AcDeclarationGiftRecord; +import com.hzs.activity.declaration.vo.AcDeclarationListVO; + +import java.util.List; /** *

@@ -13,4 +18,5 @@ import com.hzs.activity.declaration.vo.AcDeclarationGiftRecord; */ public interface IAcDeclarationGiftRecordService extends IService { + List queryList(AcDeclarationListParam param); } diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/service/impl/AcDeclarationGiftConfigServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/service/impl/AcDeclarationGiftConfigServiceImpl.java index cf1e25de..1cb9d127 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/service/impl/AcDeclarationGiftConfigServiceImpl.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/service/impl/AcDeclarationGiftConfigServiceImpl.java @@ -57,56 +57,6 @@ public class AcDeclarationGiftConfigServiceImpl extends ServiceImpl() .eq(AcDeclarationGiftConfig::getPkBaseId, pkId)); - // 删除用户权限配置 - iAcGoalMemberConfigService.remove(new LambdaQueryWrapper() - .eq(AcGoalMemberConfig::getPkBaseId, pkId)); } private void updateDeclarationConfig(ActivityParam activityParam, List acDeclarationConfigParams) { @@ -149,13 +147,8 @@ public class AcDeclarationGiftConfigServiceImpl extends ServiceImpl() .eq(AcDeclarationGiftConfig::getPkBaseId, pkId)); - // 删除用户权限配置 - iAcGoalMemberConfigService.remove(new LambdaQueryWrapper() - .eq(AcGoalMemberConfig::getPkBaseId, pkId)); // 添加加购活动配置 saveDeclarationConfig(acDeclarationConfigParams,baseConfig); - // 添加用户权限配置 - iActivityService.saveGoalMemberConfig(activityParam, baseConfig); } } diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/service/impl/AcDeclarationGiftRecordServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/service/impl/AcDeclarationGiftRecordServiceImpl.java index 8fc51640..5f93a2c4 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/service/impl/AcDeclarationGiftRecordServiceImpl.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/service/impl/AcDeclarationGiftRecordServiceImpl.java @@ -1,11 +1,17 @@ package com.hzs.activity.declaration.service.impl; +import com.hzs.activity.add.param.AcAddUpgradeListParam; import com.hzs.activity.declaration.mapper.AcDeclarationGiftRecordMapper; +import com.hzs.activity.declaration.param.AcDeclarationListParam; import com.hzs.activity.declaration.service.IAcDeclarationGiftRecordService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.hzs.activity.declaration.vo.AcDeclarationGiftRecord; +import com.hzs.activity.declaration.vo.AcDeclarationListVO; import org.springframework.stereotype.Service; +import java.util.Collections; +import java.util.List; + /** *

* 报单赠品明细表 服务实现类 @@ -17,4 +23,8 @@ import org.springframework.stereotype.Service; @Service public class AcDeclarationGiftRecordServiceImpl extends ServiceImpl implements IAcDeclarationGiftRecordService { + @Override + public List queryList(AcDeclarationListParam param) { + return baseMapper.queryList(param); + } } diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/vo/AcDeclarationListVO.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/vo/AcDeclarationListVO.java new file mode 100644 index 00000000..964b566e --- /dev/null +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/vo/AcDeclarationListVO.java @@ -0,0 +1,65 @@ +package com.hzs.activity.declaration.vo; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.hzs.common.core.annotation.Excel; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.Date; + +@Data +@AllArgsConstructor +@NoArgsConstructor +public class AcDeclarationListVO { + + /** + * 活动名称 + */ + @Excel(name = "活动名称") + private String actName; + /** + * 会员编号 + */ + @Excel(name = "会员编号") + private String memberCode; + /** + * 会员名称 + */ + @Excel(name = "会员名称") + private String memberName; + + + /** + * 活动开始时间 + */ + @Excel(name = "活动开始时间", dateFormat = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd") + private Date actStartDate; + + /** + * 活动结束时间 + */ + @Excel(name = "活动结束时间", dateFormat = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd") + private Date actEndDate; + + /** + * 创建时间 + */ + @Excel(name = "创建时间", dateFormat = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd") + private Date creationTime; + + /** + * 产品名称 + */ + @Excel(name = "产品名称") + private String productName; + + @Excel(name = "数量") + private Integer quantity; + + @Excel(name = "指定等级") + private String levelVal; +} diff --git a/bd-business/bd-business-sale/src/main/resources/mapper/activity/add/AcAddUpgradeRecordMapper.xml b/bd-business/bd-business-sale/src/main/resources/mapper/activity/add/AcAddUpgradeRecordMapper.xml index b08fb70b..0c3f7d29 100644 --- a/bd-business/bd-business-sale/src/main/resources/mapper/activity/add/AcAddUpgradeRecordMapper.xml +++ b/bd-business/bd-business-sale/src/main/resources/mapper/activity/add/AcAddUpgradeRecordMapper.xml @@ -29,5 +29,42 @@ PK_COUNTRY, PK_ID, PK_BASE_ID, PK_RULE_ID, PK_MEMBER, PK_ORIGIN_GRADE, PK_UPGRADE_GRADE, PK_ORDER_ID + diff --git a/bd-business/bd-business-sale/src/main/resources/mapper/activity/declaration/AcDeclarationGiftRecordMapper.xml b/bd-business/bd-business-sale/src/main/resources/mapper/activity/declaration/AcDeclarationGiftRecordMapper.xml index ee3413b6..295b6c74 100644 --- a/bd-business/bd-business-sale/src/main/resources/mapper/activity/declaration/AcDeclarationGiftRecordMapper.xml +++ b/bd-business/bd-business-sale/src/main/resources/mapper/activity/declaration/AcDeclarationGiftRecordMapper.xml @@ -28,5 +28,42 @@ PK_COUNTRY, PK_ID, PK_BASE_ID, PK_RULE_ID, PK_MEMBER, PK_PRODUCT, QUANTITY + diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOperationBusiness.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOperationBusiness.java index 18683b3b..9eff93ea 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOperationBusiness.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOperationBusiness.java @@ -267,7 +267,10 @@ public enum EOperationBusiness { AC_ADD_UPGRADE_LIST_EXPORT("加购升级数据"), - AC_DECLARATION_GIFT_SUBMIT("报单赠送"), + + AC_DECLARATION_GIFT_SAVE("报单赠送新增"), + AC_DECLARATION_GIFT_UPDATE("报单修改"), + AC_DECLARATION_GIFT_DELETE("报单删除"), AC_DECLARATION_GIFT_DETAIL("报单赠送详情"), diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOperationModule.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOperationModule.java index e6cf0722..defde74f 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOperationModule.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOperationModule.java @@ -377,7 +377,9 @@ public enum EOperationModule { AC_ADD_UPGRADE_LIST_EXPORT("加购升级数据导出"), - AC_DECLARATION_GIFT_SUBMIT("报单赠送"), + AC_DECLARATION_GIFT_SAVE("报单赠送新增"), + AC_DECLARATION_GIFT_UPDATE("报单修改"), + AC_DECLARATION_GIFT_DELETE("报单删除"), AC_DECLARATION_GIFT_DETAIL("报单赠送详情"), @@ -388,7 +390,6 @@ public enum EOperationModule { AC_DECLARATION_GIFT_LIST_EXPORT("报单赠送数据导出"), - ///////////////////////////统计分析//////////////////////////// STATISTIC_ANALYSIS("统计分析"),