From 46e07459472ff6cfdcc3f7dd30811a119e4979aa Mon Sep 17 00:00:00 2001 From: "DESKTOP-369JRHT\\12997" <9> Date: Thu, 9 Nov 2023 18:31:36 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=AF=E5=88=86=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fuintAdmin/src/api/integral/settings.js | 28 ++ fuintAdmin/src/views/integral/gift/index.vue | 3 - .../src/views/integral/settings/index.vue | 379 ++++++++++++++++++ .../src/views/oilConfig/oilGun/list.vue | 2 +- .../controller/IntegralGiftController.java | 5 +- .../IntegralSettingsController.java | 103 +++++ .../integral/entity/IntegralSettings.java | 94 +++++ .../mapper/IntegralSettingsMapper.java | 87 ++++ .../mapper/xml/IntegralSettingsMapper.xml | 259 ++++++++++++ .../integral/service/IntegralGiftService.java | 1 + .../service/IntegralSettingsService.java | 66 +++ .../service/impl/IntegralGiftServiceImpl.java | 9 +- .../impl/IntegralSettingsServiceImpl.java | 106 +++++ .../MtUserExpressAddressController.java | 90 +++++ .../entity/MtUserExpressAddress.java | 44 ++ .../mapper/MtUserExpressAddressMapper.java | 85 ++++ .../mapper/xml/MtUserExpressAddressMapper.xml | 167 ++++++++ .../service/MtUserExpressAddressService.java | 57 +++ .../impl/MtUserExpressAddressServiceImpl.java | 91 +++++ 19 files changed, 1666 insertions(+), 10 deletions(-) create mode 100644 fuintAdmin/src/api/integral/settings.js create mode 100644 fuintAdmin/src/views/integral/settings/index.vue create mode 100644 fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/controller/IntegralSettingsController.java create mode 100644 fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/entity/IntegralSettings.java create mode 100644 fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/mapper/IntegralSettingsMapper.java create mode 100644 fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/mapper/xml/IntegralSettingsMapper.xml create mode 100644 fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/IntegralSettingsService.java create mode 100644 fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/impl/IntegralSettingsServiceImpl.java create mode 100644 fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/controller/MtUserExpressAddressController.java create mode 100644 fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/entity/MtUserExpressAddress.java create mode 100644 fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/mapper/MtUserExpressAddressMapper.java create mode 100644 fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/mapper/xml/MtUserExpressAddressMapper.xml create mode 100644 fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/MtUserExpressAddressService.java create mode 100644 fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/MtUserExpressAddressServiceImpl.java diff --git a/fuintAdmin/src/api/integral/settings.js b/fuintAdmin/src/api/integral/settings.js new file mode 100644 index 000000000..e71c01c03 --- /dev/null +++ b/fuintAdmin/src/api/integral/settings.js @@ -0,0 +1,28 @@ +import request from "@/utils/request"; + +// 查询油罐列表 +export function getSettingsApi(data) { + return request({ + url: 'business/integral/integralSettings/getSettings', + method: 'get', + params: data + }) + } + // 新增有关信息 + export function insertSettingsApi(data) { + return request({ + url: 'business/integral/integralSettings', + method: 'post', + data: data + }) + } + // 修改有关信息 + export function updateSettingsApi(data) { + return request({ + url: 'business/integral/integralSettings', + method: 'put', + data: data + }) + } + + \ No newline at end of file diff --git a/fuintAdmin/src/views/integral/gift/index.vue b/fuintAdmin/src/views/integral/gift/index.vue index 2eb32bba8..c77d1b47c 100644 --- a/fuintAdmin/src/views/integral/gift/index.vue +++ b/fuintAdmin/src/views/integral/gift/index.vue @@ -1078,7 +1078,6 @@ export default { type: file.data.type, fileName: file.data.fileName } - console.log("giftImages",this.giftImages) if (this.giftImages == undefined) { this.giftImages = []; @@ -1088,7 +1087,6 @@ export default { }, handleRemove(file, fileList) { - console.log("file.response.data.fileName",file); this.giftImages.forEach((image, index) => { if (file.url === image.url) { @@ -1106,7 +1104,6 @@ export default { handleChildValue(value) { - console.log("value",value) this.dataForm.detailedDescription = value }, diff --git a/fuintAdmin/src/views/integral/settings/index.vue b/fuintAdmin/src/views/integral/settings/index.vue new file mode 100644 index 000000000..bf5177aee --- /dev/null +++ b/fuintAdmin/src/views/integral/settings/index.vue @@ -0,0 +1,379 @@ + + + + + diff --git a/fuintAdmin/src/views/oilConfig/oilGun/list.vue b/fuintAdmin/src/views/oilConfig/oilGun/list.vue index 0d6738493..cfe60e78f 100644 --- a/fuintAdmin/src/views/oilConfig/oilGun/list.vue +++ b/fuintAdmin/src/views/oilConfig/oilGun/list.vue @@ -45,7 +45,7 @@ - + integralGiftCategoryIPage = this.integralGiftService.queryByPage(page, integralGift); return getSuccessResult(integralGiftCategoryIPage); } @@ -55,6 +56,8 @@ public class IntegralGiftController extends BaseController { return getSuccessResult(this.integralGiftService.queryById(id)); } + + /** * 新增数据 * diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/controller/IntegralSettingsController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/controller/IntegralSettingsController.java new file mode 100644 index 000000000..58e4e2a3d --- /dev/null +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/controller/IntegralSettingsController.java @@ -0,0 +1,103 @@ +package com.fuint.business.integral.controller; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.fuint.business.integral.entity.IntegralGift; +import com.fuint.business.integral.entity.IntegralSettings; +import com.fuint.business.integral.service.IntegralSettingsService; +import com.fuint.framework.web.BaseController; +import com.fuint.framework.web.ResponseObject; +import org.springframework.web.bind.annotation.*; +import io.lettuce.core.dynamic.annotation.Param; + + +import javax.annotation.Resource; + +/** + * 积分设置表(IntegralSettings)表控制层 + * + * @author makejava + * @since 2023-11-09 10:13:20 + */ +@RestController +@RequestMapping("business/integral/integralSettings") +public class IntegralSettingsController extends BaseController { + /** + * 服务对象 + */ + @Resource + private IntegralSettingsService integralSettingsService; + + /** + * 分页查询 + * + * @param integralSettings 筛选条件 + * @param pageNo 分页对象 + * @return 查询结果 + */ + @GetMapping("queryByPage") + public ResponseObject queryByPage(@RequestParam(value = "pageNo",defaultValue = "1") Integer pageNo, + @RequestParam(value = "pageSize",defaultValue = "10") Integer pageSize, + @Param("integralSettings") IntegralSettings integralSettings) { + Page page = new Page(pageNo, pageSize); + + IPage< IntegralSettings> iPageList = this.integralSettingsService.queryByPage(page, integralSettings); + return getSuccessResult(iPageList); + } + + /** + * 通过主键查询单条数据 + * + * @param id 主键 + * @return 单条数据 + */ + @GetMapping("{id}") + public ResponseObject queryById(@PathVariable("id") Integer id) { + return getSuccessResult(this.integralSettingsService.queryById(id)); + } + + /** + * 通过店铺的规则 + * + * @return 单条数据 + */ + @GetMapping("getSettings") + public ResponseObject getSettings(IntegralSettings integralSettings) { + return getSuccessResult(this.integralSettingsService.getSettings(integralSettings)); + } + + /** + * 新增数据 + * + * @param integralSettings 实体 + * @return 新增结果 + */ + @PostMapping + public ResponseObject add(@RequestBody IntegralSettings integralSettings) { + return getSuccessResult(this.integralSettingsService.insert(integralSettings)); + } + + /** + * 编辑数据 + * + * @param integralSettings 实体 + * @return 编辑结果 + */ + @PutMapping + public ResponseObject edit(@RequestBody IntegralSettings integralSettings) { + return getSuccessResult(this.integralSettingsService.update(integralSettings)); + } + + /** + * 删除数据 + * + * @param id 主键 + * @return 删除是否成功 + */ + @DeleteMapping + public ResponseObject deleteById(Integer id) { + return getSuccessResult(this.integralSettingsService.deleteById(id)); + } + +} + diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/entity/IntegralSettings.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/entity/IntegralSettings.java new file mode 100644 index 000000000..e99cc10a0 --- /dev/null +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/entity/IntegralSettings.java @@ -0,0 +1,94 @@ +package com.fuint.business.integral.entity; + +import java.util.Date; +import com.fuint.repository.model.base.BaseEntity; +import lombok.Data; + +/** + * 积分设置表(IntegralSettings)实体类 + * + * @author wangh + * @since 2023-11-09 10:13:20 + */ +@Data +public class IntegralSettings extends BaseEntity { + private static final long serialVersionUID = 584440463835012416L; + /** + * 积分设置ID + */ + private Integer id; + /** + * 加油积分规则 + */ + private Integer refuelPointsRules; + /** + * 加油积分功能 + */ + private Integer refuelPointsFunction; + /** + * 加油场景类型 + */ + private Integer refuelSceneType; + /** + * 加油金额类型 + */ + private Integer refuelAmountType; + /** + * 加油储值参与 + */ + private Integer refuelValueParticipation; + /** + * 加油场景规则 + */ + private Integer refuelSceneRules; + /** + * 加油消费金额 + */ + private Double refuelConsumptionAmount; + /** + * 加油积分 + */ + private Integer refuelPoints; + /** + * 加油油品金额 + */ + private Double refuelFuelAmount; + /** + * 加油油品升数 + */ + private Double refuelFuelVolume; + /** + * 充值赠送 + */ + private Integer rechargeGive; + /** + * 邀请赠送 + */ + private Integer inviteGive; + /** + * 邀请赠送规则 + */ + private String inviteGiveRules; + /** + * 签到功能 + */ + private Integer signInFunction; + /** + * 签到规则 + */ + private String signInRules; + /** + * 签到获得 + */ + private String pointsObtained; + /** + * 积分规则 + */ + private String pointsRules; + /** + * 店铺ID + */ + private Integer storeId; + +} + diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/mapper/IntegralSettingsMapper.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/mapper/IntegralSettingsMapper.java new file mode 100644 index 000000000..0a2b1fb28 --- /dev/null +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/mapper/IntegralSettingsMapper.java @@ -0,0 +1,87 @@ +package com.fuint.business.integral.mapper; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.fuint.business.integral.entity.IntegralSettings; +import org.apache.ibatis.annotations.Param; +import org.springframework.data.domain.Pageable; +import java.util.List; + +/** + * 积分设置表(IntegralSettings)表数据库访问层 + * + * @author makejava + * @since 2023-11-09 10:13:20 + */ +public interface IntegralSettingsMapper { + + /** + * 通过ID查询单条数据 + * + * @param id 主键 + * @return 实例对象 + */ + IntegralSettings queryById(Integer id); + + /** + * 查询指定行数据 + * + * @param integralSettings 查询条件 + * @param page 分页对象 + * @return 对象列表 + */ + IPage queryAllByLimit(@Param("page") Page page, @Param("integralSettings") IntegralSettings integralSettings); + + + IntegralSettings getSettings(@Param("integralSettings") IntegralSettings integralSettings); + /** + * 统计总行数 + * + * @param integralSettings 查询条件 + * @return 总行数 + */ + long count(IntegralSettings integralSettings); + + /** + * 新增数据 + * + * @param integralSettings 实例对象 + * @return 影响行数 + */ + int insert(IntegralSettings integralSettings); + + /** + * 批量新增数据（MyBatis原生foreach方法） + * + * @param entities List 实例对象列表 + * @return 影响行数 + */ + int insertBatch(@Param("entities") List entities); + + /** + * 批量新增或按主键更新数据（MyBatis原生foreach方法） + * + * @param entities List 实例对象列表 + * @return 影响行数 + * @throws org.springframework.jdbc.BadSqlGrammarException 入参是空List的时候会抛SQL语句错误的异常，请自行校验入参 + */ + int insertOrUpdateBatch(@Param("entities") List entities); + + /** + * 修改数据 + * + * @param integralSettings 实例对象 + * @return 影响行数 + */ + int update(IntegralSettings integralSettings); + + /** + * 通过主键删除数据 + * + * @param id 主键 + * @return 影响行数 + */ + int deleteById(Integer id); + +} + diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/mapper/xml/IntegralSettingsMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/mapper/xml/IntegralSettingsMapper.xml new file mode 100644 index 000000000..d9924a2e1 --- /dev/null +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/mapper/xml/IntegralSettingsMapper.xml @@ -0,0 +1,259 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + insert into integral_settings(refuel_points_rules, refuel_points_function, refuel_scene_type, refuel_amount_type, refuel_value_participation, refuel_scene_rules, refuel_consumption_amount, refuel_points, refuel_fuel_amount, refuel_fuel_volume, recharge_give, invite_give, invite_give_rules, sign_in_function, sign_in_rules, points_obtained, points_rules, store_id, create_time, update_time, create_by, update_by) + values (#{refuelPointsRules}, #{refuelPointsFunction}, #{refuelSceneType}, #{refuelAmountType}, #{refuelValueParticipation}, #{refuelSceneRules}, #{refuelConsumptionAmount}, #{refuelPoints}, #{refuelFuelAmount}, #{refuelFuelVolume}, #{rechargeGive}, #{inviteGive}, #{inviteGiveRules}, #{signInFunction}, #{signInRules}, #{pointsObtained}, #{pointsRules}, #{storeId}, #{createTime}, #{createTime}, #{createBy}, #{updateBy}) + + + + insert into integral_settings(refuel_points_rules, refuel_points_function, refuel_scene_type, refuel_amount_type, refuel_value_participation, refuel_scene_rules, refuel_consumption_amount, refuel_points, refuel_fuel_amount, refuel_fuel_volume, recharge_give, invite_give, invite_give_rules, sign_in_function, sign_in_rules, points_obtained, points_rules, store_id, create_time, update_time, create_by, update_by) + values + + (#{entity.refuelPointsRules}, #{entity.refuelPointsFunction}, #{entity.refuelSceneType}, #{entity.refuelAmountType}, #{entity.refuelValueParticipation}, #{entity.refuelSceneRules}, #{entity.refuelConsumptionAmount}, #{entity.refuelPoints}, #{entity.refuelFuelAmount}, #{entity.refuelFuelVolume}, #{entity.rechargeGive}, #{entity.inviteGive}, #{entity.inviteGiveRules}, #{entity.signInFunction}, #{entity.signInRules}, #{entity.pointsObtained}, #{entity.pointsRules}, #{entity.storeId}, #{entity.createTime}, #{entity.updateTime}, #{entity.createBy}, #{entity.updateBy}) + + + + + insert into integral_settings(refuel_points_rules, refuel_points_function, refuel_scene_type, refuel_amount_type, refuel_value_participation, refuel_scene_rules, refuel_consumption_amount, refuel_points, refuel_fuel_amount, refuel_fuel_volume, recharge_give, invite_give, invite_give_rules, sign_in_function, sign_in_rules, points_obtained, points_rules, store_id, create_time, update_time, create_by, update_by) + values + + (#{entity.refuelPointsRules}, #{entity.refuelPointsFunction}, #{entity.refuelSceneType}, #{entity.refuelAmountType}, #{entity.refuelValueParticipation}, #{entity.refuelSceneRules}, #{entity.refuelConsumptionAmount}, #{entity.refuelPoints}, #{entity.refuelFuelAmount}, #{entity.refuelFuelVolume}, #{entity.rechargeGive}, #{entity.inviteGive}, #{entity.inviteGiveRules}, #{entity.signInFunction}, #{entity.signInRules}, #{entity.pointsObtained}, #{entity.pointsRules}, #{entity.storeId}, #{entity.createTime}, #{entity.updateTime}, #{entity.createBy}, #{entity.updateBy}) + + on duplicate key update + refuel_points_rules = values(refuel_points_rules), + refuel_points_function = values(refuel_points_function), + refuel_scene_type = values(refuel_scene_type), + refuel_amount_type = values(refuel_amount_type), + refuel_value_participation = values(refuel_value_participation), + refuel_scene_rules = values(refuel_scene_rules), + refuel_consumption_amount = values(refuel_consumption_amount), + refuel_points = values(refuel_points), + refuel_fuel_amount = values(refuel_fuel_amount), + refuel_fuel_volume = values(refuel_fuel_volume), + recharge_give = values(recharge_give), + invite_give = values(invite_give), + invite_give_rules = values(invite_give_rules), + sign_in_function = values(sign_in_function), + sign_in_rules = values(sign_in_rules), + points_obtained = values(points_obtained), + points_rules = values(points_rules), + store_id = values(store_id), + create_time = values(create_time), + update_time = values(update_time), + create_by = values(create_by), + update_by = values(update_by) + + + + + update integral_settings + + + refuel_points_rules = #{refuelPointsRules}, + + + refuel_points_function = #{refuelPointsFunction}, + + + refuel_scene_type = #{refuelSceneType}, + + + refuel_amount_type = #{refuelAmountType}, + + + refuel_value_participation = #{refuelValueParticipation}, + + + refuel_scene_rules = #{refuelSceneRules}, + + + refuel_consumption_amount = #{refuelConsumptionAmount}, + + + refuel_points = #{refuelPoints}, + + + refuel_fuel_amount = #{refuelFuelAmount}, + + + refuel_fuel_volume = #{refuelFuelVolume}, + + + recharge_give = #{rechargeGive}, + + + invite_give = #{inviteGive}, + + + invite_give_rules = #{inviteGiveRules}, + + + sign_in_function = #{signInFunction}, + + + sign_in_rules = #{signInRules}, + + + points_obtained = #{pointsObtained}, + + + points_rules = #{pointsRules}, + + + store_id = #{storeId}, + + + create_time = #{createTime}, + + + update_time = #{updateTime}, + + + create_by = #{createBy}, + + + update_by = #{updateBy}, + + + where id = #{id} + + + + + delete from integral_settings where id = #{id} + + + + diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/IntegralGiftService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/IntegralGiftService.java index 4fbcffcbb..965aab2c5 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/IntegralGiftService.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/IntegralGiftService.java @@ -24,6 +24,7 @@ public interface IntegralGiftService { */ IntegralGift queryById(Integer id); + /** * 分页查询 * diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/IntegralSettingsService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/IntegralSettingsService.java new file mode 100644 index 000000000..9372a5588 --- /dev/null +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/IntegralSettingsService.java @@ -0,0 +1,66 @@ +package com.fuint.business.integral.service; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.fuint.business.integral.entity.IntegralGift; +import com.fuint.business.integral.entity.IntegralSettings; +import io.lettuce.core.dynamic.annotation.Param; + + +/** + * 积分设置表(IntegralSettings)表服务接口 + * + * @author makejava + * @since 2023-11-09 10:13:20 + */ +public interface IntegralSettingsService { + + /** + * 通过ID查询单条数据 + * + * @param id 主键 + * @return 实例对象 + */ + IntegralSettings queryById(Integer id); + + /** + * 分页查询 + * + * @param integralSettings 筛选条件 + * @param page 分页对象 + * @return 查询结果 + */ + IPage queryByPage(@Param("page") Page page, IntegralSettings integralSettings); + + /** + * 查询店铺的数据 + * + * @return 实例对象 + */ + IntegralSettings getSettings(IntegralSettings integralSettings); + + /** + * 新增数据 + * + * @param integralSettings 实例对象 + * @return 实例对象 + */ + IntegralSettings insert(IntegralSettings integralSettings); + + /** + * 修改数据 + * + * @param integralSettings 实例对象 + * @return 实例对象 + */ + IntegralSettings update(IntegralSettings integralSettings); + + /** + * 通过主键删除数据 + * + * @param id 主键 + * @return 是否成功 + */ + boolean deleteById(Integer id); + +} diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/impl/IntegralGiftServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/impl/IntegralGiftServiceImpl.java index ec25bbf44..294166425 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/impl/IntegralGiftServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/impl/IntegralGiftServiceImpl.java @@ -1,8 +1,8 @@ package com.fuint.business.integral.service.impl; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.fuint.business.integral.entity.IntegralGift; -import com.fuint.business.integral.entity.IntegralGiftCategory; import com.fuint.business.integral.mapper.IntegralGiftMapper; import com.fuint.business.integral.service.IntegralGiftService; import com.fuint.business.integral.vo.IntegralGiftVO; @@ -10,9 +10,6 @@ import com.fuint.common.dto.AccountInfo; import com.fuint.common.util.TokenUtil; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Service; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.PageImpl; -import org.springframework.data.domain.PageRequest; import javax.annotation.Resource; @@ -38,6 +35,8 @@ public class IntegralGiftServiceImpl implements IntegralGiftService { return this.integralGiftDao.queryById(id); } + + /** * 分页查询 * @@ -46,7 +45,7 @@ public class IntegralGiftServiceImpl implements IntegralGiftService { * @return 查询结果 */ @Override - public IPage queryByPage(@Param("page") com.baomidou.mybatisplus.extension.plugins.pagination.Page page, @Param("integralGiftCategory") IntegralGift integralGift) { + public IPage queryByPage(@Param("page") Page page, @Param("integralGiftCategory") IntegralGift integralGift) { AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo(); integralGift.setStoreId(nowAccountInfo.getStoreId()); return integralGiftDao.queryAllByLimit(page, integralGift); diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/impl/IntegralSettingsServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/impl/IntegralSettingsServiceImpl.java new file mode 100644 index 000000000..e6ebead7c --- /dev/null +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/impl/IntegralSettingsServiceImpl.java @@ -0,0 +1,106 @@ +package com.fuint.business.integral.service.impl; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.fuint.business.integral.entity.IntegralGift; +import com.fuint.business.integral.entity.IntegralSettings; +import com.fuint.business.integral.mapper.IntegralSettingsMapper; +import com.fuint.business.integral.service.IntegralSettingsService; +import org.springframework.stereotype.Service; +import com.fuint.common.util.TokenUtil; +import io.lettuce.core.dynamic.annotation.Param; +import com.fuint.common.dto.AccountInfo; + + + +import javax.annotation.Resource; + +/** + * 积分设置表(IntegralSettings)表服务实现类 + * + * @author makejava + * @since 2023-11-09 10:13:20 + */ +@Service("integralSettingsService") +public class IntegralSettingsServiceImpl implements IntegralSettingsService { + @Resource + private IntegralSettingsMapper integralSettingsMapper; + + /** + * 通过ID查询单条数据 + * + * @param id 主键 + * @return 实例对象 + */ + @Override + public IntegralSettings queryById(Integer id) { + return this.integralSettingsMapper.queryById(id); + } + + /** + * 分页查询 + * + * @param integralSettings 筛选条件 + * @param page 分页对象 + * @return 查询结果 + */ + @Override + public IPage queryByPage(@Param("page") Page page, IntegralSettings integralSettings) { + AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo(); + integralSettings.setStoreId(nowAccountInfo.getStoreId()); + return integralSettingsMapper.queryAllByLimit(page,integralSettings); + } + + @Override + public IntegralSettings getSettings(IntegralSettings integralSettings) { + AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo(); + integralSettings.setStoreId(nowAccountInfo.getStoreId()); + IntegralSettings settings = this.integralSettingsMapper.getSettings(integralSettings); + if (settings != null) { + return settings; + } + insert(integralSettings); + return integralSettings; + } + + /** + * 新增数据 + * + * @param integralSettings 实例对象 + * @return 实例对象 + */ + @Override + public IntegralSettings insert(IntegralSettings integralSettings) { + AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo(); + integralSettings.setStoreId(nowAccountInfo.getStoreId()); + integralSettings.setCreateBy(nowAccountInfo.getStaffId().toString()); + + this.integralSettingsMapper.insert(integralSettings); + return integralSettings; + } + + /** + * 修改数据 + * + * @param integralSettings 实例对象 + * @return 实例对象 + */ + @Override + public IntegralSettings update(IntegralSettings integralSettings) { + AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo(); + integralSettings.setUpdateBy(nowAccountInfo.getStaffId().toString()); + this.integralSettingsMapper.update(integralSettings); + return this.queryById(integralSettings.getId()); + } + + /** + * 通过主键删除数据 + * + * @param id 主键 + * @return 是否成功 + */ + @Override + public boolean deleteById(Integer id) { + return this.integralSettingsMapper.deleteById(id) > 0; + } +} diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/controller/MtUserExpressAddressController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/controller/MtUserExpressAddressController.java new file mode 100644 index 000000000..eb086f72b --- /dev/null +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/controller/MtUserExpressAddressController.java @@ -0,0 +1,90 @@ +package com.fuint.business.userManager.controller; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.fuint.business.userManager.entity.MtUserExpressAddress; +import com.fuint.business.userManager.service.MtUserExpressAddressService; +import com.fuint.framework.web.BaseController; +import com.fuint.framework.web.ResponseObject; +import io.lettuce.core.dynamic.annotation.Param; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; + +/** + * 会员快递信息表(MtUserExpressAddress)表控制层 + * + * @author makejava + * @since 2023-11-09 09:31:12 + */ +@RestController +@RequestMapping("/business/userManager/mtUserExpressAddress") +public class MtUserExpressAddressController extends BaseController { + /** + * 服务对象 + */ + @Resource + private MtUserExpressAddressService mtUserExpressAddressService; + + /** + * 分页查询 + * + * @param mtUserExpressAddress 筛选条件 + * @param pageNo 分页对象 + * @return 查询结果 + */ + @GetMapping("queryByPage") + public ResponseObject queryByPage(@RequestParam(value = "pageNo",defaultValue = "1") Integer pageNo, + @RequestParam(value = "pageSize",defaultValue = "10") Integer pageSize, + @Param("mtUserExpressAddress") MtUserExpressAddress mtUserExpressAddress) { + Page page = new Page(pageNo, pageSize); + IPage ipageList = this.mtUserExpressAddressService.queryByPage(page, mtUserExpressAddress); + return getSuccessResult(ipageList); + } + + /** + * 通过主键查询单条数据 + * + * @param id 主键 + * @return 单条数据 + */ + @GetMapping("{id}") + public ResponseObject queryById(@PathVariable("id") Integer id) { + return getSuccessResult(this.mtUserExpressAddressService.queryById(id)); + } + + /** + * 新增数据 + * + * @param mtUserExpressAddress 实体 + * @return 新增结果 + */ + @PostMapping + public ResponseObject add(@RequestBody MtUserExpressAddress mtUserExpressAddress) { + return getSuccessResult(this.mtUserExpressAddressService.insert(mtUserExpressAddress)); + } + + /** + * 编辑数据 + * + * @param mtUserExpressAddress 实体 + * @return 编辑结果 + */ + @PutMapping + public ResponseObject edit(@RequestBody MtUserExpressAddress mtUserExpressAddress) { + return getSuccessResult(this.mtUserExpressAddressService.update(mtUserExpressAddress)); + } + + /** + * 删除数据 + * + * @param id 主键 + * @return 删除是否成功 + */ + @DeleteMapping + public ResponseObject deleteById(Integer id) { + return getSuccessResult(this.mtUserExpressAddressService.deleteById(id)); + } + +} + diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/entity/MtUserExpressAddress.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/entity/MtUserExpressAddress.java new file mode 100644 index 000000000..526f82f23 --- /dev/null +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/entity/MtUserExpressAddress.java @@ -0,0 +1,44 @@ +package com.fuint.business.userManager.entity; + +import java.util.Date; +import com.fuint.repository.model.base.BaseEntity; +import lombok.Data; + +/** + * 会员快递信息表(MtUserExpressAddress)实体类 + * + * @author makejava + * @since 2023-11-09 09:31:12 + */ +@Data +public class MtUserExpressAddress extends BaseEntity { + private static final long serialVersionUID = -79175411933260284L; + + private Integer id; + /** + * 关联用户ID + */ + private Integer userId; + /** + * 名字 + */ + private String name; + /** + * 联系方式 + */ + private String mobile; + /** + * 地址 + */ + private String address; + /** + * 是否默认，0表示否，1表示是 + */ + private String ifDefault; + /** + * 店铺ID + */ + private Integer storeId; + +} + diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/mapper/MtUserExpressAddressMapper.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/mapper/MtUserExpressAddressMapper.java new file mode 100644 index 000000000..7d65e46ca --- /dev/null +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/mapper/MtUserExpressAddressMapper.java @@ -0,0 +1,85 @@ +package com.fuint.business.userManager.mapper; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.fuint.business.userManager.entity.MtUserExpressAddress; +import org.apache.ibatis.annotations.Param; +import org.springframework.data.domain.Pageable; +import java.util.List; + +/** + * 会员快递信息表(MtUserExpressAddress)表数据库访问层 + * + * @author makejava + * @since 2023-11-09 09:31:12 + */ +public interface MtUserExpressAddressMapper { + + /** + * 通过ID查询单条数据 + * + * @param id 主键 + * @return 实例对象 + */ + MtUserExpressAddress queryById(Integer id); + + /** + * 查询指定行数据 + * + * @param mtUserExpressAddress 查询条件 + * @param page 分页对象 + * @return 对象列表 + */ + IPage queryAllByLimit(@Param("page") Page page,@Param("mtUserExpressAddress") MtUserExpressAddress mtUserExpressAddress); + + /** + * 统计总行数 + * + * @param mtUserExpressAddress 查询条件 + * @return 总行数 + */ + long count(MtUserExpressAddress mtUserExpressAddress); + + /** + * 新增数据 + * + * @param mtUserExpressAddress 实例对象 + * @return 影响行数 + */ + int insert(MtUserExpressAddress mtUserExpressAddress); + + /** + * 批量新增数据（MyBatis原生foreach方法） + * + * @param entities List 实例对象列表 + * @return 影响行数 + */ + int insertBatch(@Param("entities") List entities); + + /** + * 批量新增或按主键更新数据（MyBatis原生foreach方法） + * + * @param entities List 实例对象列表 + * @return 影响行数 + * @throws org.springframework.jdbc.BadSqlGrammarException 入参是空List的时候会抛SQL语句错误的异常，请自行校验入参 + */ + int insertOrUpdateBatch(@Param("entities") List entities); + + /** + * 修改数据 + * + * @param mtUserExpressAddress 实例对象 + * @return 影响行数 + */ + int update(MtUserExpressAddress mtUserExpressAddress); + + /** + * 通过主键删除数据 + * + * @param id 主键 + * @return 影响行数 + */ + int deleteById(Integer id); + +} + diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/mapper/xml/MtUserExpressAddressMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/mapper/xml/MtUserExpressAddressMapper.xml new file mode 100644 index 000000000..29e32171a --- /dev/null +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/mapper/xml/MtUserExpressAddressMapper.xml @@ -0,0 +1,167 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + insert into mt_user_express_address(user_id, name, mobile, address, if_default, store_id, create_time, update_time, create_by, update_by) + values (#{userId}, #{name}, #{mobile}, #{address}, #{ifDefault}, #{storeId}, #{createTime}, #{createTime}, #{createBy}, #{updateBy}) + + + + insert into mt_user_express_address(user_id, name, mobile, address, if_default, store_id, create_time, update_time, create_by, update_by) + values + + (#{entity.userId}, #{entity.name}, #{entity.mobile}, #{entity.address}, #{entity.ifDefault}, #{entity.storeId}, #{entity.createTime}, #{entity.updateTime}, #{entity.createBy}, #{entity.updateBy}) + + + + + insert into mt_user_express_address(user_id, name, mobile, address, if_default, store_id, create_time, update_time, create_by, update_by) + values + + (#{entity.userId}, #{entity.name}, #{entity.mobile}, #{entity.address}, #{entity.ifDefault}, #{entity.storeId}, #{entity.createTime}, #{entity.updateTime}, #{entity.createBy}, #{entity.updateBy}) + + on duplicate key update + user_id = values(user_id), + name = values(name), + mobile = values(mobile), + address = values(address), + if_default = values(if_default), + store_id = values(store_id), + create_time = values(create_time), + update_time = values(update_time), + create_by = values(create_by), + update_by = values(update_by) + + + + + update mt_user_express_address + + + user_id = #{userId}, + + + name = #{name}, + + + mobile = #{mobile}, + + + address = #{address}, + + + if_default = #{ifDefault}, + + + store_id = #{storeId}, + + + update_time = NOW(), + + + create_by = #{createBy}, + + + update_by = #{updateBy}, + + + where id = #{id} + + + + + delete from mt_user_express_address where id = #{id} + + + + diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/MtUserExpressAddressService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/MtUserExpressAddressService.java new file mode 100644 index 000000000..e91c30762 --- /dev/null +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/MtUserExpressAddressService.java @@ -0,0 +1,57 @@ +package com.fuint.business.userManager.service; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.fuint.business.userManager.entity.MtUserExpressAddress; +import io.lettuce.core.dynamic.annotation.Param; + +/** + * 会员快递信息表(MtUserExpressAddress)表服务接口 + * + * @author makejava + * @since 2023-11-09 09:31:33 + */ +public interface MtUserExpressAddressService { + + /** + * 通过ID查询单条数据 + * + * @param id 主键 + * @return 实例对象 + */ + MtUserExpressAddress queryById(Integer id); + + /** + * 分页查询 + * + * @param mtUserExpressAddress 筛选条件 + * @param page 分页对象 + * @return 查询结果 + */ + IPage queryByPage(@Param("page") Page page, MtUserExpressAddress mtUserExpressAddress); + + /** + * 新增数据 + * + * @param mtUserExpressAddress 实例对象 + * @return 实例对象 + */ + MtUserExpressAddress insert(MtUserExpressAddress mtUserExpressAddress); + + /** + * 修改数据 + * + * @param mtUserExpressAddress 实例对象 + * @return 实例对象 + */ + MtUserExpressAddress update(MtUserExpressAddress mtUserExpressAddress); + + /** + * 通过主键删除数据 + * + * @param id 主键 + * @return 是否成功 + */ + boolean deleteById(Integer id); + +} diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/MtUserExpressAddressServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/MtUserExpressAddressServiceImpl.java new file mode 100644 index 000000000..3db980692 --- /dev/null +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/MtUserExpressAddressServiceImpl.java @@ -0,0 +1,91 @@ +package com.fuint.business.userManager.service.impl; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.fuint.business.userManager.entity.MtUserExpressAddress; +import com.fuint.business.userManager.mapper.MtUserExpressAddressMapper; +import com.fuint.business.userManager.service.MtUserExpressAddressService; +import com.fuint.common.dto.AccountInfo; +import io.lettuce.core.dynamic.annotation.Param; +import org.springframework.stereotype.Service; +import com.fuint.common.util.TokenUtil; + +import javax.annotation.Resource; + +/** + * 会员快递信息表(MtUserExpressAddress)表服务实现类 + * + * @author makejava + * @since 2023-11-09 09:31:33 + */ +@Service("mtUserExpressAddressService") +public class MtUserExpressAddressServiceImpl implements MtUserExpressAddressService { + @Resource + private MtUserExpressAddressMapper mtUserExpressAddressMapper; + + /** + * 通过ID查询单条数据 + * + * @param id 主键 + * @return 实例对象 + */ + @Override + public MtUserExpressAddress queryById(Integer id) { + return this.mtUserExpressAddressMapper.queryById(id); + } + + /** + * 分页查询 + * + * @param mtUserExpressAddress 筛选条件 + * @param page 分页对象 + * @return 查询结果 + */ + @Override + public IPage queryByPage(@Param("page") Page page, MtUserExpressAddress mtUserExpressAddress) { + AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo(); + mtUserExpressAddress.setStoreId(nowAccountInfo.getStoreId()); + return mtUserExpressAddressMapper.queryAllByLimit(page,mtUserExpressAddress); + } + + /** + * 新增数据 + * + * @param mtUserExpressAddress 实例对象 + * @return 实例对象 + */ + @Override + public MtUserExpressAddress insert(MtUserExpressAddress mtUserExpressAddress) { + AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo(); + mtUserExpressAddress.setStoreId(nowAccountInfo.getStoreId()); + mtUserExpressAddress.setCreateBy(nowAccountInfo.getStaffId().toString()); + this.mtUserExpressAddressMapper.insert(mtUserExpressAddress); + return mtUserExpressAddress; + } + + /** + * 修改数据 + * + * @param mtUserExpressAddress 实例对象 + * @return 实例对象 + */ + @Override + public MtUserExpressAddress update(MtUserExpressAddress mtUserExpressAddress) { + AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo(); + mtUserExpressAddress.setUpdateBy(nowAccountInfo.getStaffId().toString()); + + this.mtUserExpressAddressMapper.update(mtUserExpressAddress); + return this.queryById(mtUserExpressAddress.getId()); + } + + /** + * 通过主键删除数据 + * + * @param id 主键 + * @return 是否成功 + */ + @Override + public boolean deleteById(Integer id) { + return this.mtUserExpressAddressMapper.deleteById(id) > 0; + } +}