Compare commits

...

2 Commits

Author SHA1 Message Date
RIceWqy 88a9e26790 portfolio
2 years ago
RIceWqy 3ae97de844 init
2 years ago

@ -0,0 +1,57 @@
{label: '店铺id',
prop: 'shopId',
search: true
},{label: '店铺名称',prop: 'shopName',
search: true
},{label: '店长用户id',prop: 'userId',
search: true
},{label: '店铺类型',prop: 'shopType',
search: true
},{label: '店铺简介',prop: 'intro',
search: true
},{label: '店铺公告',prop: 'shopNotice',
search: true
},{label: '店铺行业',prop: 'shopIndustry',
search: true
},{label: '店长',prop: 'shopOwner',
search: true
},{label: '店铺绑定的手机',prop: 'mobile',
search: true
},{label: '店铺联系电话',prop: 'tel',
search: true
},{label: '店铺所在纬度',prop: 'shopLat',
search: true
},{label: '店铺所在经度',prop: 'shopLng',
search: true
},{label: '店铺详细地址',prop: 'shopAddress',
search: true
},{label: '店铺所在省份',prop: 'province',
search: true
},{label: '店铺所在城市',prop: 'city',
search: true
},{label: '店铺所在区域',prop: 'area',
search: true
},{label: '店铺省市区代码',prop: 'pcaCode',
search: true
},{label: '店铺logo',prop: 'shopLogo',
search: true
},{label: '店铺相册',prop: 'shopPhotos',
search: true
},{label: '每天营业时间段',prop: 'openTime',
search: true
},{label: '店铺状态(-1:未开通 0: 停业中 1:营业中)',prop: 'shopStatus',
search: true
},{label: '0:商家承担运费 1:买家承担运费',prop: 'transportType',
search: true
},{label: '固定运费',prop: 'fixedFreight',
search: true
},{label: '满X包邮',prop: 'fullFreeShipping',
search: true
},{label: '创建时间',prop: 'createTime',
search: true
},{label: '更新时间',prop: 'updateTime',
search: true
},{label: '分销设置(0关闭 1开启)',prop: 'isDistribution',
search: true
}

@ -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<IPage<PickAddr>> page(PickAddr pickAddr,PageParam<PickAddr> page){
IPage<PickAddr> pickAddrs = pickAddrService.page(page,new LambdaQueryWrapper<PickAddr>()
.like(StrUtil.isNotBlank(pickAddr.getAddrName()),PickAddr::getAddrName,pickAddr.getAddrName())
.orderByDesc(PickAddr::getAddrId));
return ServerResponseEntity.success(pickAddrs);
}
@PreAuthorize("@pms.hasPermission('shop:pickAddr:page')")
public ServerResponseEntity<IPage<PickAddr>> page(PickAddr pickAddr, PageParam<PickAddr> page) {
YamiSysUser sysUser = SecurityUtils.getSysUser();
Long userId = sysUser.getUserId();
ShopDetail shopDetail = shopDetailService.getOne(new LambdaQueryWrapper<ShopDetail>().eq(ShopDetail::getUserId, userId));
IPage<PickAddr> pickAddrs = pickAddrService.page(page, new LambdaQueryWrapper<PickAddr>().
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<PickAddr> 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<PickAddr> info(@PathVariable("id") Long id) {
PickAddr pickAddr = pickAddrService.getById(id);
return ServerResponseEntity.success(pickAddr);
}
/**
*
*/
@PostMapping
@PreAuthorize("@pms.hasPermission('shop:pickAddr:save')")
public ServerResponseEntity<Void> 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<Void> 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<Void> update(@Valid @RequestBody PickAddr pickAddr){
PickAddr dbPickAddr = pickAddrService.getById(pickAddr.getAddrId());
/**
*
*/
@PutMapping
@PreAuthorize("@pms.hasPermission('shop:pickAddr:update')")
public ServerResponseEntity<Void> 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<Void> delete(@RequestBody Long[] ids){
pickAddrService.removeByIds(Arrays.asList(ids));
return ServerResponseEntity.success();
}
/**
*
*/
@DeleteMapping
@PreAuthorize("@pms.hasPermission('shop:pickAddr:delete')")
public ServerResponseEntity<Void> delete(@RequestBody Long[] ids) {
pickAddrService.removeByIds(Arrays.asList(ids));
return ServerResponseEntity.success();
}
}

@ -0,0 +1,40 @@
package com.yami.shop.admin.controller;
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.User;
import com.yami.shop.bean.model.UserPortfolio;
import com.yami.shop.common.response.ServerResponseEntity;
import com.yami.shop.common.util.PageParam;
import com.yami.shop.service.UserPortfolioService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@RestController
@RequestMapping("/user/portfolio")
public class UserPortfolioController {
@Autowired
private UserPortfolioService userPortfolioService;
@GetMapping("/page")
@PreAuthorize("@pms.hasPermission('user:userPortfolio:page')")
public ServerResponseEntity<IPage<UserPortfolio>> page(UserPortfolio userPortfolio, PageParam<UserPortfolio> page) {
IPage<UserPortfolio> userPortfolioIPage = userPortfolioService.page(page, new LambdaQueryWrapper<UserPortfolio>()
.like(StrUtil.isNotBlank(userPortfolio.getName()), UserPortfolio::getName, userPortfolio.getName()));
return ServerResponseEntity.success(userPortfolioIPage);
}
@GetMapping("/info/{portfolio}")
@PreAuthorize("@pms.hasPermission('user:userPortfolio:detail')")
public ServerResponseEntity<UserPortfolio>info(@PathVariable("portfolio") String portfolio) {
UserPortfolio userPortfolio =
userPortfolioService.getOne(new LambdaQueryWrapper<UserPortfolio>().eq(UserPortfolio::getPortfolioId, portfolio));
return ServerResponseEntity.success(userPortfolio);
}
}

@ -0,0 +1,59 @@
package com.yami.shop.bean.model;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import java.util.Date;
@Data
@TableName("tz_user_portfolio")
public class UserPortfolio {
// 基本信息
@TableId
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; // 生命维持治疗决定书
// 档案状态
private Integer portfolioStatus;
// 拒绝理由
private String rejectionReason;
}

@ -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

@ -0,0 +1,8 @@
package com.yami.shop.dao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yami.shop.bean.model.UserPortfolio;
public interface UserPortfolioMapper extends BaseMapper<UserPortfolio> {
}

@ -0,0 +1,8 @@
package com.yami.shop.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.yami.shop.bean.model.User;
import com.yami.shop.bean.model.UserPortfolio;
public interface UserPortfolioService extends IService<UserPortfolio> {
}

@ -0,0 +1,11 @@
package com.yami.shop.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yami.shop.bean.model.UserPortfolio;
import com.yami.shop.dao.UserPortfolioMapper;
import com.yami.shop.service.UserPortfolioService;
import org.springframework.stereotype.Service;
@Service
public class UserPortfolioServiceImpl extends ServiceImpl<UserPortfolioMapper, UserPortfolio> implements UserPortfolioService {
}

@ -0,0 +1,52 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yami.shop.dao.UserPortfolioMapper">
<resultMap id="BaseResultMap" type="com.yami.shop.bean.model.UserPortfolio">
<!-- 基本信息 -->
<id property="portfolioId" column="portfolio_id" jdbcType="INTEGER"/>
<result property="userId" column="user_id" jdbcType="INTEGER"/>
<result property="name" column="name" jdbcType="VARCHAR"/>
<result property="birthDate" column="birth_date" jdbcType="DATE"/>
<result property="gender" column="gender" jdbcType="VARCHAR"/>
<result property="ethnicity" column="ethnicity" jdbcType="VARCHAR"/>
<result property="nativePlace" column="native_place" jdbcType="VARCHAR"/>
<result property="idCardNumber" column="id_card_number" jdbcType="VARCHAR"/>
<!-- 联系信息 -->
<result property="address" column="address" jdbcType="VARCHAR"/>
<result property="phoneNumber" column="phone_number" jdbcType="VARCHAR"/>
<result property="emailAddress" column="email_address" jdbcType="VARCHAR"/>
<result property="emergencyContactName" column="emergency_contact_name" jdbcType="VARCHAR"/>
<result property="emergencyContactPhone" column="emergency_contact_phone" jdbcType="VARCHAR"/>
<!-- 健康信息 -->
<result property="healthStatus" column="health_status" jdbcType="VARCHAR"/>
<result property="medicalInsuranceInfo" column="medical_insurance_info" jdbcType="VARCHAR"/>
<result property="primaryDoctorContact" column="primary_doctor_contact" jdbcType="VARCHAR"/>
<result property="longTermMedicationInfo" column="long_term_medication_info" jdbcType="VARCHAR"/>
<!-- 预先规划的殡葬信息 -->
<result property="funeralMethod" column="funeral_method" jdbcType="VARCHAR"/>
<result property="ceremonyType" column="ceremony_type" jdbcType="VARCHAR"/>
<result property="cemeteryInfo" column="cemetery_info" jdbcType="VARCHAR"/>
<result property="prePurchasedGrave" column="pre_purchased_grave" jdbcType="BOOLEAN"/>
<result property="preReservedFuneralLocation" column="pre_reserved_funeral_location" jdbcType="VARCHAR"/>
<result property="hasWillOrLivingDirective" column="has_will_or_living_directive" jdbcType="BOOLEAN"/>
<!-- 财务信息 -->
<result property="paymentMethod" column="payment_method" jdbcType="VARCHAR"/>
<result property="bankAccountInfo" column="bank_account_info" jdbcType="VARCHAR"/>
<result property="prePaidFuneralCost" column="pre_paid_funeral_cost" jdbcType="DOUBLE"/>
<!-- 法律文件 -->
<result property="willCopy" column="will_copy" jdbcType="VARCHAR"/>
<result property="preDeathAgentDesignation" column="pre_death_agent_designation" jdbcType="VARCHAR"/>
<result property="medicalAgentDesignation" column="medical_agent_designation" jdbcType="VARCHAR"/>
<result property="lifeSupportDecision" column="life_support_decision" jdbcType="VARCHAR"/>
<result property="portfolioStatus" column="portfolio_status" jdbcType="INTEGER"/>
<result property="rejectionReason" column="rejection_reason" jdbcType="INTEGER"/>
</resultMap>
</mapper>
Loading…
Cancel
Save