diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeDiscountRecords/controller/ActiveDiscountRecordsController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeDiscountRecords/controller/ActiveDiscountRecordsController.java new file mode 100644 index 000000000..78e0a66f0 --- /dev/null +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeDiscountRecords/controller/ActiveDiscountRecordsController.java @@ -0,0 +1,90 @@ +package com.fuint.business.marketingActivity.activeDiscountRecords.controller; + + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.api.ApiController; +import com.baomidou.mybatisplus.extension.api.R; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.fuint.business.marketingActivity.activeDiscountRecords.entity.ActiveDiscountRecords; +import com.fuint.business.marketingActivity.activeDiscountRecords.service.ActiveDiscountRecordsService; +import com.fuint.framework.web.BaseController; +import com.fuint.framework.web.ResponseObject; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.io.Serializable; +import java.util.List; + +/** + * 折扣活动记录表(ActiveDiscountRecords)表控制层 + * + * @author makejava + * @since 2024-01-19 17:13:25 + */ +@RestController +@RequestMapping("business/marketingActivity/activeDiscountRecords") +public class ActiveDiscountRecordsController extends BaseController { + /** + * 服务对象 + */ + @Resource + private ActiveDiscountRecordsService activeDiscountRecordsService; + + /** + * 分页查询所有数据 + * + * @param page 分页对象 + * @param activeDiscountRecords 查询实体 + * @return 所有数据 + */ + @GetMapping + public ResponseObject selectAll(Page page, ActiveDiscountRecords activeDiscountRecords) { + return getSuccessResult(this.activeDiscountRecordsService.page(page, new QueryWrapper<>(activeDiscountRecords))); + } + + /** + * 通过主键查询单条数据 + * + * @param id 主键 + * @return 单条数据 + */ + @GetMapping("{id}") + public ResponseObject selectOne(@PathVariable Serializable id) { + return getSuccessResult(this.activeDiscountRecordsService.getById(id)); + } + + /** + * 新增数据 + * + * @param activeDiscountRecords 实体对象 + * @return 新增结果 + */ + @PostMapping + public ResponseObject insert(@RequestBody ActiveDiscountRecords activeDiscountRecords) { + return getSuccessResult(this.activeDiscountRecordsService.save(activeDiscountRecords)); + } + + /** + * 修改数据 + * + * @param activeDiscountRecords 实体对象 + * @return 修改结果 + */ + @PutMapping + public ResponseObject update(@RequestBody ActiveDiscountRecords activeDiscountRecords) { + return getSuccessResult(this.activeDiscountRecordsService.updateById(activeDiscountRecords)); + } + + /** + * 删除数据 + * + * @param idList 主键结合 + * @return 删除结果 + */ + @DeleteMapping + public ResponseObject delete(@RequestParam("idList") List idList) { + return getSuccessResult(this.activeDiscountRecordsService.removeByIds(idList)); + } +} + diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeDiscountRecords/entity/ActiveDiscountRecords.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeDiscountRecords/entity/ActiveDiscountRecords.java new file mode 100644 index 000000000..935c9c588 --- /dev/null +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeDiscountRecords/entity/ActiveDiscountRecords.java @@ -0,0 +1,107 @@ +package com.fuint.business.marketingActivity.activeDiscountRecords.entity; + +import java.util.Date; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import java.io.Serializable; + +/** + * 折扣活动记录表(ActiveDiscountRecords)表实体类 + * + * @author makejava + * @since 2024-01-19 17:13:25 + */ +@SuppressWarnings("serial") +public class ActiveDiscountRecords extends Model { + //主键id + private Integer id; + //活动id + private Integer activeDiscountId; + //用户id + private Integer userId; + //店铺id + private Integer storeId; + //创建者 + private String createBy; + //创建时间 + private Date createTime; + //更新者 + private String updateBy; + //更新时间 + private Date updateTime; + + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public Integer getActiveDiscountId() { + return activeDiscountId; + } + + public void setActiveDiscountId(Integer activeDiscountId) { + this.activeDiscountId = activeDiscountId; + } + + public Integer getUserId() { + return userId; + } + + public void setUserId(Integer userId) { + this.userId = userId; + } + + public Integer getStoreId() { + return storeId; + } + + public void setStoreId(Integer storeId) { + this.storeId = storeId; + } + + public String getCreateBy() { + return createBy; + } + + public void setCreateBy(String createBy) { + this.createBy = createBy; + } + + public Date getCreateTime() { + return createTime; + } + + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + + public String getUpdateBy() { + return updateBy; + } + + public void setUpdateBy(String updateBy) { + this.updateBy = updateBy; + } + + public Date getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(Date updateTime) { + this.updateTime = updateTime; + } + + /** + * 获取主键值 + * + * @return 主键值 + */ + @Override + protected Serializable pkVal() { + return this.id; + } + } + diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeDiscountRecords/mapper/ActiveDiscountRecordsMapper.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeDiscountRecords/mapper/ActiveDiscountRecordsMapper.java new file mode 100644 index 000000000..a32eb5cdd --- /dev/null +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeDiscountRecords/mapper/ActiveDiscountRecordsMapper.java @@ -0,0 +1,15 @@ +package com.fuint.business.marketingActivity.activeDiscountRecords.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.fuint.business.marketingActivity.activeDiscountRecords.entity.ActiveDiscountRecords; + +/** + * 折扣活动记录表(ActiveDiscountRecords)表数据库访问层 + * + * @author makejava + * @since 2024-01-19 17:13:25 + */ +public interface ActiveDiscountRecordsMapper extends BaseMapper { + +} + diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeDiscountRecords/service/ActiveDiscountRecordsService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeDiscountRecords/service/ActiveDiscountRecordsService.java new file mode 100644 index 000000000..1a8eb8238 --- /dev/null +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeDiscountRecords/service/ActiveDiscountRecordsService.java @@ -0,0 +1,15 @@ +package com.fuint.business.marketingActivity.activeDiscountRecords.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.fuint.business.marketingActivity.activeDiscountRecords.entity.ActiveDiscountRecords; + +/** + * 折扣活动记录表(ActiveDiscountRecords)表服务接口 + * + * @author makejava + * @since 2024-01-19 17:13:26 + */ +public interface ActiveDiscountRecordsService extends IService { + +} + diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeDiscountRecords/service/impl/ActiveDiscountRecordsServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeDiscountRecords/service/impl/ActiveDiscountRecordsServiceImpl.java new file mode 100644 index 000000000..c73ee536a --- /dev/null +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeDiscountRecords/service/impl/ActiveDiscountRecordsServiceImpl.java @@ -0,0 +1,19 @@ +package com.fuint.business.marketingActivity.activeDiscountRecords.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.fuint.business.marketingActivity.activeDiscountRecords.mapper.ActiveDiscountRecordsMapper; +import com.fuint.business.marketingActivity.activeDiscountRecords.entity.ActiveDiscountRecords; +import com.fuint.business.marketingActivity.activeDiscountRecords.service.ActiveDiscountRecordsService; +import org.springframework.stereotype.Service; + +/** + * 折扣活动记录表(ActiveDiscountRecords)表服务实现类 + * + * @author makejava + * @since 2024-01-19 17:13:26 + */ +@Service("activeDiscountRecordsService") +public class ActiveDiscountRecordsServiceImpl extends ServiceImpl implements ActiveDiscountRecordsService { + +} + diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeFullminusRecords/controller/ActiveFullminusRecordsController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeFullminusRecords/controller/ActiveFullminusRecordsController.java new file mode 100644 index 000000000..fbd107a0e --- /dev/null +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeFullminusRecords/controller/ActiveFullminusRecordsController.java @@ -0,0 +1,90 @@ +package com.fuint.business.marketingActivity.activeFullminusRecords.controller; + + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.api.ApiController; +import com.baomidou.mybatisplus.extension.api.R; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.fuint.business.marketingActivity.activeFullminusRecords.entity.ActiveFullminusRecords; +import com.fuint.business.marketingActivity.activeFullminusRecords.service.ActiveFullminusRecordsService; +import com.fuint.framework.web.BaseController; +import com.fuint.framework.web.ResponseObject; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.io.Serializable; +import java.util.List; + +/** + * 满减活动记录表(ActiveFullminusRecords)表控制层 + * + * @author makejava + * @since 2024-01-19 17:12:45 + */ +@RestController +@RequestMapping("business/marketingActivity/activeFullminusRecords") +public class ActiveFullminusRecordsController extends BaseController { + /** + * 服务对象 + */ + @Resource + private ActiveFullminusRecordsService activeFullminusRecordsService; + + /** + * 分页查询所有数据 + * + * @param page 分页对象 + * @param activeFullminusRecords 查询实体 + * @return 所有数据 + */ + @GetMapping + public ResponseObject selectAll(Page page, ActiveFullminusRecords activeFullminusRecords) { + return getSuccessResult(this.activeFullminusRecordsService.page(page, new QueryWrapper<>(activeFullminusRecords))); + } + + /** + * 通过主键查询单条数据 + * + * @param id 主键 + * @return 单条数据 + */ + @GetMapping("{id}") + public ResponseObject selectOne(@PathVariable Serializable id) { + return getSuccessResult(this.activeFullminusRecordsService.getById(id)); + } + + /** + * 新增数据 + * + * @param activeFullminusRecords 实体对象 + * @return 新增结果 + */ + @PostMapping + public ResponseObject insert(@RequestBody ActiveFullminusRecords activeFullminusRecords) { + return getSuccessResult(this.activeFullminusRecordsService.save(activeFullminusRecords)); + } + + /** + * 修改数据 + * + * @param activeFullminusRecords 实体对象 + * @return 修改结果 + */ + @PutMapping + public ResponseObject update(@RequestBody ActiveFullminusRecords activeFullminusRecords) { + return getSuccessResult(this.activeFullminusRecordsService.updateById(activeFullminusRecords)); + } + + /** + * 删除数据 + * + * @param idList 主键结合 + * @return 删除结果 + */ + @DeleteMapping + public ResponseObject delete(@RequestParam("idList") List idList) { + return getSuccessResult(this.activeFullminusRecordsService.removeByIds(idList)); + } +} + diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeFullminusRecords/entity/ActiveFullminusRecords.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeFullminusRecords/entity/ActiveFullminusRecords.java new file mode 100644 index 000000000..9cbdccf16 --- /dev/null +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeFullminusRecords/entity/ActiveFullminusRecords.java @@ -0,0 +1,107 @@ +package com.fuint.business.marketingActivity.activeFullminusRecords.entity; + +import java.util.Date; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import java.io.Serializable; + +/** + * 满减活动记录表(ActiveFullminusRecords)表实体类 + * + * @author makejava + * @since 2024-01-19 17:12:45 + */ +@SuppressWarnings("serial") +public class ActiveFullminusRecords extends Model { + //主键id + private Integer id; + //活动id + private Integer activeFullminusId; + //用户id + private Integer userId; + //店铺id + private Integer storeId; + //创建者 + private String createBy; + //创建时间 + private Date createTime; + //更新者 + private String updateBy; + //更新时间 + private Date updateTime; + + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public Integer getActiveFullminusId() { + return activeFullminusId; + } + + public void setActiveFullminusId(Integer activeFullminusId) { + this.activeFullminusId = activeFullminusId; + } + + public Integer getUserId() { + return userId; + } + + public void setUserId(Integer userId) { + this.userId = userId; + } + + public Integer getStoreId() { + return storeId; + } + + public void setStoreId(Integer storeId) { + this.storeId = storeId; + } + + public String getCreateBy() { + return createBy; + } + + public void setCreateBy(String createBy) { + this.createBy = createBy; + } + + public Date getCreateTime() { + return createTime; + } + + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + + public String getUpdateBy() { + return updateBy; + } + + public void setUpdateBy(String updateBy) { + this.updateBy = updateBy; + } + + public Date getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(Date updateTime) { + this.updateTime = updateTime; + } + + /** + * 获取主键值 + * + * @return 主键值 + */ + @Override + protected Serializable pkVal() { + return this.id; + } + } + diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeFullminusRecords/mapper/ActiveFullminusRecordsMapper.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeFullminusRecords/mapper/ActiveFullminusRecordsMapper.java new file mode 100644 index 000000000..56987169d --- /dev/null +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeFullminusRecords/mapper/ActiveFullminusRecordsMapper.java @@ -0,0 +1,15 @@ +package com.fuint.business.marketingActivity.activeFullminusRecords.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.fuint.business.marketingActivity.activeFullminusRecords.entity.ActiveFullminusRecords; + +/** + * 满减活动记录表(ActiveFullminusRecords)表数据库访问层 + * + * @author makejava + * @since 2024-01-19 17:12:45 + */ +public interface ActiveFullminusRecordsMapper extends BaseMapper { + +} + diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeFullminusRecords/service/ActiveFullminusRecordsService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeFullminusRecords/service/ActiveFullminusRecordsService.java new file mode 100644 index 000000000..c921bd298 --- /dev/null +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeFullminusRecords/service/ActiveFullminusRecordsService.java @@ -0,0 +1,15 @@ +package com.fuint.business.marketingActivity.activeFullminusRecords.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.fuint.business.marketingActivity.activeFullminusRecords.entity.ActiveFullminusRecords; + +/** + * 满减活动记录表(ActiveFullminusRecords)表服务接口 + * + * @author makejava + * @since 2024-01-19 17:12:45 + */ +public interface ActiveFullminusRecordsService extends IService { + +} + diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeFullminusRecords/service/impl/ActiveFullminusRecordsServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeFullminusRecords/service/impl/ActiveFullminusRecordsServiceImpl.java new file mode 100644 index 000000000..932df42fc --- /dev/null +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeFullminusRecords/service/impl/ActiveFullminusRecordsServiceImpl.java @@ -0,0 +1,19 @@ +package com.fuint.business.marketingActivity.activeFullminusRecords.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.fuint.business.marketingActivity.activeFullminusRecords.mapper.ActiveFullminusRecordsMapper; +import com.fuint.business.marketingActivity.activeFullminusRecords.entity.ActiveFullminusRecords; +import com.fuint.business.marketingActivity.activeFullminusRecords.service.ActiveFullminusRecordsService; +import org.springframework.stereotype.Service; + +/** + * 满减活动记录表(ActiveFullminusRecords)表服务实现类 + * + * @author makejava + * @since 2024-01-19 17:12:45 + */ +@Service("activeFullminusRecordsService") +public class ActiveFullminusRecordsServiceImpl extends ServiceImpl implements ActiveFullminusRecordsService { + +} + diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/controller/CardFavorableRecordController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/controller/CardFavorableRecordController.java index a8a3f11df..e05be9cbb 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/controller/CardFavorableRecordController.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/controller/CardFavorableRecordController.java @@ -2,6 +2,7 @@ package com.fuint.business.marketingActivity.cardFavorable.controller; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.fuint.business.marketingActivity.activeExchange.vo.PaymentActiveVO; import com.fuint.business.marketingActivity.cardFavorable.dto.IdListDTO; import com.fuint.business.marketingActivity.cardFavorable.entity.CardFavorable; import com.fuint.business.marketingActivity.cardFavorable.entity.CardFavorableRecord; @@ -115,6 +116,17 @@ public class CardFavorableRecordController extends BaseController { return getSuccessResult(this.cardFavorableRecordService.updateById(cardFavorableRecord)); } + /** + * 核销 + * + * @param paymentActiveVO 实体对象 + * @return 修改结果 + */ + @PutMapping("updateCardAndActiveById") + public ResponseObject updateCardAndActiveById(@RequestBody PaymentActiveVO paymentActiveVO) { + return getSuccessResult(this.cardFavorableRecordService.updateCardAndActiveById(paymentActiveVO)); + } + /** * 删除数据 * diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/mapper/CardFavorableRecordMapper.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/mapper/CardFavorableRecordMapper.java index ae8809e49..c0be2bdf0 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/mapper/CardFavorableRecordMapper.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/mapper/CardFavorableRecordMapper.java @@ -38,5 +38,7 @@ public interface CardFavorableRecordMapper extends BaseMapper selectAllByCondition(@Param("page") Page page, @Param("cardFavorableDTOS") CardFavorableDTOS cardFavorableDTOS); List getCanUserCardFavorableList(@Param("paymentActiveDTO") PaymentActiveDTO paymentActiveDTO); + + boolean updateCardAndActiveById(@Param("cardFavorableId") Integer cardFavorableId, @Param("userId") Integer userId, @Param("storeId") Integer storeId); } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/mapper/xml/CardFavorableRecordMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/mapper/xml/CardFavorableRecordMapper.xml index 8764d558e..991da8eeb 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/mapper/xml/CardFavorableRecordMapper.xml +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/mapper/xml/CardFavorableRecordMapper.xml @@ -141,5 +141,13 @@ AND cfr.end_time AND cfr.status = 0 + + + update card_favorable_record + set status = 1 + where card_favorable_id = #{cardFavorableId} + and mt_user_id = #{userId} + and store_id = #{storeId} + diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/service/CardFavorableRecordService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/service/CardFavorableRecordService.java index b68771cd5..1caea10f4 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/service/CardFavorableRecordService.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/service/CardFavorableRecordService.java @@ -3,6 +3,7 @@ package com.fuint.business.marketingActivity.cardFavorable.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; +import com.fuint.business.marketingActivity.activeExchange.vo.PaymentActiveVO; import com.fuint.business.marketingActivity.cardFavorable.dto.IdListDTO; import com.fuint.business.marketingActivity.cardFavorable.entity.CardFavorableRecord; import com.fuint.business.marketingActivity.cardFavorable.vo.CardFavorableRecordVO; @@ -55,5 +56,12 @@ public interface CardFavorableRecordService extends IService queryWrapper = new LambdaQueryWrapper<>(); if (ObjectUtils.isNotEmpty(cardFavorableRecord.getMobile())){ @@ -214,5 +227,38 @@ public class CardFavorableRecordServiceImpl extends ServiceImpl