From 3ae97de844724b33a4bfbabb05d3f6e1a2caeef6 Mon Sep 17 00:00:00 2001 From: RIceWqy <1840169763@qq.com> Date: Thu, 11 Jan 2024 21:42:08 +0800 Subject: [PATCH] init --- .../admin/controller/PickAddrController.java | 113 ++++++++++-------- .../yami/shop/bean/model/UserPortfolio.java | 52 ++++++++ .../src/main/resources/shop.properties | 8 +- 3 files changed, 116 insertions(+), 57 deletions(-) create mode 100644 yami-shop-bean/src/main/java/com/yami/shop/bean/model/UserPortfolio.java diff --git a/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/PickAddrController.java b/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/PickAddrController.java index b170280..b8e33df 100644 --- a/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/PickAddrController.java +++ b/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/PickAddrController.java @@ -14,24 +14,25 @@ import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.yami.shop.bean.model.PickAddr; +import com.yami.shop.bean.model.ShopDetail; import com.yami.shop.common.exception.YamiShopBindException; import com.yami.shop.common.response.ResponseEnum; import com.yami.shop.common.response.ServerResponseEntity; import com.yami.shop.common.util.PageParam; +import com.yami.shop.security.admin.model.YamiSysUser; import com.yami.shop.security.admin.util.SecurityUtils; import com.yami.shop.service.PickAddrService; +import com.yami.shop.service.ShopDetailService; +import jakarta.validation.Valid; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; -import jakarta.validation.Valid; import java.util.Arrays; import java.util.Objects; - /** - * * @author lgh on 2018/10/17. */ @RestController @@ -40,62 +41,68 @@ public class PickAddrController { @Autowired private PickAddrService pickAddrService; + @Autowired + private ShopDetailService shopDetailService; - /** - * 分页获取 - */ + /** + * 分页获取 + */ @GetMapping("/page") - @PreAuthorize("@pms.hasPermission('shop:pickAddr:page')") - public ServerResponseEntity> page(PickAddr pickAddr,PageParam page){ - IPage pickAddrs = pickAddrService.page(page,new LambdaQueryWrapper() - .like(StrUtil.isNotBlank(pickAddr.getAddrName()),PickAddr::getAddrName,pickAddr.getAddrName()) - .orderByDesc(PickAddr::getAddrId)); - return ServerResponseEntity.success(pickAddrs); - } + @PreAuthorize("@pms.hasPermission('shop:pickAddr:page')") + public ServerResponseEntity> page(PickAddr pickAddr, PageParam page) { + YamiSysUser sysUser = SecurityUtils.getSysUser(); + Long userId = sysUser.getUserId(); + ShopDetail shopDetail = shopDetailService.getOne(new LambdaQueryWrapper().eq(ShopDetail::getUserId, userId)); + IPage pickAddrs = pickAddrService.page(page, new LambdaQueryWrapper(). + eq(PickAddr::getShopId, shopDetail.getShopId()) + .like(StrUtil.isNotBlank(pickAddr.getAddrName()), PickAddr::getAddrName, pickAddr.getAddrName()) + .orderByDesc(PickAddr::getAddrId)); + return ServerResponseEntity.success(pickAddrs); + } /** - * 获取信息 - */ - @GetMapping("/info/{id}") - @PreAuthorize("@pms.hasPermission('shop:pickAddr:info')") - public ServerResponseEntity info(@PathVariable("id") Long id){ - PickAddr pickAddr = pickAddrService.getById(id); - return ServerResponseEntity.success(pickAddr); - } + * 获取信息 + */ + @GetMapping("/info/{id}") + @PreAuthorize("@pms.hasPermission('shop:pickAddr:info')") + public ServerResponseEntity info(@PathVariable("id") Long id) { + PickAddr pickAddr = pickAddrService.getById(id); + return ServerResponseEntity.success(pickAddr); + } - /** - * 保存 - */ - @PostMapping - @PreAuthorize("@pms.hasPermission('shop:pickAddr:save')") - public ServerResponseEntity save(@Valid @RequestBody PickAddr pickAddr){ - pickAddr.setShopId(SecurityUtils.getSysUser().getShopId()); - pickAddrService.save(pickAddr); - return ServerResponseEntity.success(); - } + /** + * 保存 + */ + @PostMapping + @PreAuthorize("@pms.hasPermission('shop:pickAddr:save')") + public ServerResponseEntity save(@Valid @RequestBody PickAddr pickAddr) { + pickAddr.setShopId(SecurityUtils.getSysUser().getShopId()); + pickAddrService.save(pickAddr); + return ServerResponseEntity.success(); + } - /** - * 修改 - */ - @PutMapping - @PreAuthorize("@pms.hasPermission('shop:pickAddr:update')") - public ServerResponseEntity update(@Valid @RequestBody PickAddr pickAddr){ - PickAddr dbPickAddr = pickAddrService.getById(pickAddr.getAddrId()); + /** + * 修改 + */ + @PutMapping + @PreAuthorize("@pms.hasPermission('shop:pickAddr:update')") + public ServerResponseEntity update(@Valid @RequestBody PickAddr pickAddr) { + PickAddr dbPickAddr = pickAddrService.getById(pickAddr.getAddrId()); - if (!Objects.equals(dbPickAddr.getShopId(),SecurityUtils.getSysUser().getShopId())) { - throw new YamiShopBindException(ResponseEnum.UNAUTHORIZED); - } - pickAddrService.updateById(pickAddr); - return ServerResponseEntity.success(); - } + if (!Objects.equals(dbPickAddr.getShopId(), SecurityUtils.getSysUser().getShopId())) { + throw new YamiShopBindException(ResponseEnum.UNAUTHORIZED); + } + pickAddrService.updateById(pickAddr); + return ServerResponseEntity.success(); + } - /** - * 删除 - */ - @DeleteMapping - @PreAuthorize("@pms.hasPermission('shop:pickAddr:delete')") - public ServerResponseEntity delete(@RequestBody Long[] ids){ - pickAddrService.removeByIds(Arrays.asList(ids)); - return ServerResponseEntity.success(); - } + /** + * 删除 + */ + @DeleteMapping + @PreAuthorize("@pms.hasPermission('shop:pickAddr:delete')") + public ServerResponseEntity delete(@RequestBody Long[] ids) { + pickAddrService.removeByIds(Arrays.asList(ids)); + return ServerResponseEntity.success(); + } } diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/model/UserPortfolio.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/model/UserPortfolio.java new file mode 100644 index 0000000..2543f37 --- /dev/null +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/model/UserPortfolio.java @@ -0,0 +1,52 @@ +package com.yami.shop.bean.model; + +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.util.Date; + +@Data +@TableName("tz_user_portfolio") +public class UserPortfolio { + // 基本信息 + private Integer portfolioId; //档案id + private Integer userId; // 会员ID + private String name; // 姓名 + private Date birthDate; // 出生日期 + private String gender; // 性别 + private String ethnicity; // 民族 + private String nativePlace; // 籍贯 + private String idCardNumber; // 身份证号码 + + // 联系信息 + private String address; // 住址 + private String phoneNumber; // 联系电话 + private String emailAddress; // 电子邮件地址 + private String emergencyContactName; // 紧急联系人姓名 + private String emergencyContactPhone; // 紧急联系人电话 + + // 健康信息 + private String healthStatus; // 健康状况 + private String medicalInsuranceInfo; // 医疗保险信息 + private String primaryDoctorContact; // 主要医生联系信息 + private String longTermMedicationInfo; // 长期用药信息 + + // 预先规划的殡葬信息 + private String funeralMethod; // 殡葬方式（火葬，土葬，海葬等） + private String ceremonyType; // 预期的礼仪类型（宗教，非宗教，军人等） + private String cemeteryInfo; // 墓地信息（如果有的话） + private boolean prePurchasedGrave; // 是否有预购墓地 + private String preReservedFuneralLocation; // 是否有预定的葬礼地点 + private boolean hasWillOrLivingDirective; // 是否有遗嘱或活葬指示 + + // 财务信息 + private String paymentMethod; // 支付方式 + private String bankAccountInfo; // 银行账户信息 + private double prePaidFuneralCost; // 预先支付的葬礼费用（如果有的话） + + // 法律文件 + private String willCopy; // 遗嘱复印件 + private String preDeathAgentDesignation; // 生前事务代理人指定书 + private String medicalAgentDesignation; // 医疗事务代理人指定书 + private String lifeSupportDecision; // 生命维持治疗决定书 +} diff --git a/yami-shop-common/src/main/resources/shop.properties b/yami-shop-common/src/main/resources/shop.properties index 9f9c6b7..63b0068 100644 --- a/yami-shop-common/src/main/resources/shop.properties +++ b/yami-shop-common/src/main/resources/shop.properties @@ -1,7 +1,7 @@ # \u4E03\u725B\u4E91\u914D\u7F6E -shop.qiniu.resourcesUrl=https://img.mall4j.com/ -shop.qiniu.accessKey=**** -shop.qiniu.secretKey=**** +shop.qiniu.resourcesUrl=https://img.jintongapp.com/ +shop.qiniu.accessKey=gfzcyBDr9cd5FTForpe7HJGzELLJxztTtHhUmh6o +shop.qiniu.secretKey=zs4K9rT4Hxa3jo5OL_V2Aq5oM8yXw_O1F2jlvlJJ shop.qiniu.bucket=**** # \u5177\u4F53\u67E5\u770BQiniuZone.java shop.qiniu.zone=HUA_NAN @@ -17,4 +17,4 @@ shop.imgUpload.imagePath=D:/Mall4j/IMG/ # 1.\u672C\u5730\u6587\u4EF6\u4E0A\u4F20 2.\u4E03\u725B\u4E91 \u5982\u679C\u9009\u62E9\u4E86\u4E03\u725B\u4E91\u5C31\u4E0D\u9700\u8981\u518D\u914D\u7F6E\u672C\u5730\u6587\u4EF6\u4E0A\u4F20 shop.imgUpload.uploadType=2 # \u672C\u5730\u6587\u4EF6\u4E0A\u4F20\u7684\u8DEF\u5F84 -shop.imgUpload.resourceUrl=http://localhost:8085/mall4j/img/ \ No newline at end of file +shop.imgUpload.resourceUrl=http://localhost:8085/mall4j/img/