From 545ec852c3d38747f83fd139700bcc742f467807 Mon Sep 17 00:00:00 2001 From: liux <963924687@qq.com> Date: Fri, 21 Feb 2025 13:53:44 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=94=B6=E8=B4=A7=E5=9C=B0?= =?UTF-8?q?=E5=9D=80=E3=80=81=E5=88=A0=E9=99=A4=E6=94=B6=E8=B4=A7=E5=9C=B0?= =?UTF-8?q?=E5=9D=80=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/CustAddrController.java | 22 +++++++++++++---- .../customer/dto/AddCustAddrForAppDTO.java | 4 ++++ .../bonus/core/customer/model/CustAddr.java | 3 ++- .../service/impl/CustInfoBusinessImpl.java | 24 ++++++++++++++++--- 4 files changed, 45 insertions(+), 8 deletions(-) diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/customer/controller/CustAddrController.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/customer/controller/CustAddrController.java index 358ce682..83e6a786 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/customer/controller/CustAddrController.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/customer/controller/CustAddrController.java @@ -46,10 +46,14 @@ public class CustAddrController extends BaseController { @Resource private CustCasualService custCasualService; + @Resource + private CustInfoBusiness custInfoBusiness; + @Resource private AesEncryptUtil aesEncryptUtil; + @ApiOperation("小程序查询地址信息") @PostMapping({"/queryCustAddrForApp"}) public AjaxResult queryCustAddrForApp( @RequestBody CustCasual custCasualDto) { @@ -116,13 +120,23 @@ public class CustAddrController extends BaseController { @PostMapping({"/addCustAddrForApp"}) @RequiresGuest public AjaxResult addCustAddrForApp( @RequestBody AddCustAddrForAppDTO custAddr) { -// custAddr.setOpenid(this.getOpenidByHeaders(headers)); -// custAddr.setSourceType(this.getSourceTypeByHeaders(headers)); -// custAddr.setCustId(HeaderFetchUtil.getCustId(headers)); -// this.custInfoBusiness.addCustAddrForApp(custAddr); + this.custInfoBusiness.addCustAddrForApp(custAddr); return success(); } + @ApiOperation("小程序删除地址信息") + @PostMapping({"/deleteCustAddrForApp"}) + @RequiresGuest + public AjaxResult deleteCustAddrForApp(@RequestBody CustAddr custAddr) { + if (custAddr.getId() == null) { + log.error("[地址信息]小程序删除_上送参数错误,主键id不能为空"); + return error("主键id不能为空"); + } else { + this.custAddrService.deleteCustAddrForApp(custAddr); + return success(); + } + } + } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/customer/dto/AddCustAddrForAppDTO.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/customer/dto/AddCustAddrForAppDTO.java index d592779b..03ae3c6c 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/customer/dto/AddCustAddrForAppDTO.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/customer/dto/AddCustAddrForAppDTO.java @@ -1,10 +1,14 @@ package com.bonus.core.customer.dto; +import com.baomidou.mybatisplus.annotation.TableId; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @Data public class AddCustAddrForAppDTO { + @TableId + @ApiModelProperty("主键") + private Long id; @ApiModelProperty("人员id") private Long custId; @ApiModelProperty("人员姓名") diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/customer/model/CustAddr.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/customer/model/CustAddr.java index f5042f0e..ba5c7bbb 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/customer/model/CustAddr.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/customer/model/CustAddr.java @@ -1,5 +1,6 @@ package com.bonus.core.customer.model; +import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; @@ -14,7 +15,7 @@ import java.time.LocalDateTime; @Data public class CustAddr extends Model { private static final long serialVersionUID = 1L; - @TableId + @TableId(value = "id", type = IdType.AUTO) @ApiModelProperty("主键自增") private Long id; @ApiModelProperty("人员id") diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/customer/service/impl/CustInfoBusinessImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/customer/service/impl/CustInfoBusinessImpl.java index bea3a457..1c282242 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/customer/service/impl/CustInfoBusinessImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/customer/service/impl/CustInfoBusinessImpl.java @@ -3,15 +3,19 @@ package com.bonus.core.customer.service.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.text.CharSequenceUtil; import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.bonus.common.core.exception.ServiceException; +import com.bonus.constant.LeConstants; import com.bonus.core.auth.mobile.api.AliPayApi; import com.bonus.core.customer.dto.AddCustAddrForAppDTO; import com.bonus.core.customer.dto.CustHealthExcelModel; import com.bonus.core.customer.dto.CustInfoDTO; import com.bonus.core.customer.dto.CustInfoModel; +import com.bonus.core.customer.model.CustAddr; import com.bonus.core.customer.model.CustInfo; import com.bonus.core.customer.openapi.CustInfoOpenApi; +import com.bonus.core.customer.service.CustAddrService; import com.bonus.core.customer.service.CustCasualService; import com.bonus.core.customer.service.CustInfoBusiness; import com.bonus.core.customer.service.CustInfoService; @@ -23,6 +27,7 @@ import com.bonus.domain.CustCasualModel; import com.bonus.domain.CustInfoAppIdLoginDTO; import com.bonus.domain.CustInfoAppIdLoginVO; import com.bonus.i18n.I18n; +import com.bonus.utils.LeBeanUtil; import com.bonus.utils.RetCodeEnum; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -33,6 +38,7 @@ import org.springframework.web.multipart.MultipartFile; import org.springframework.context.annotation.Lazy; import javax.annotation.Resource; +import java.util.List; import java.util.Objects; @Service @@ -47,13 +53,25 @@ public class CustInfoBusinessImpl implements CustInfoBusiness { @Resource @Lazy private CustInfoService custInfoService; - - - + @Resource + @Lazy + private CustAddrService custAddrService; @Override public void addCustAddrForApp(AddCustAddrForAppDTO custAddrDTO) { + // custAddrDTO.setMobile(this.aesEncryptUtil.aesDecode(custAddrDTO.getMobile())); + CustAddr custAddr = (CustAddr) LeBeanUtil.copyCreateProperties(custAddrDTO, CustAddr.class); + CustAddr paramAddr = new CustAddr(); + paramAddr.setOpenid(custAddrDTO.getOpenid()); + paramAddr.setSourceType(custAddrDTO.getSourceType()); + paramAddr.setIfDel(LeConstants.COMMON_NO); + List custAddrList = this.custAddrService.list(Wrappers.query(paramAddr)); + if (CollectionUtils.isEmpty(custAddrList)) { + custAddr.setIfDefault(LeConstants.COMMON_YES); + } + + this.custAddrService.insertCustAddr(custAddr); } @Override