From 76c1266688882784807831c62b2401c4f227fe47 Mon Sep 17 00:00:00 2001 From: zccbbg Date: Thu, 7 Mar 2024 11:56:45 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=89=8B=E6=9C=BA=E5=8F=B7?= =?UTF-8?q?=E5=8A=A0=E8=A7=A3=E5=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/cyl/h5/service/H5OrderService.java | 1 + .../oms/controller/OrderController.java | 41 ++++++++----------- .../com/cyl/manager/oms/domain/Order.java | 14 ++++--- .../cyl/manager/oms/service/OrderService.java | 10 +++++ 4 files changed, 38 insertions(+), 28 deletions(-) diff --git a/ruoyi-mall/src/main/java/com/cyl/h5/service/H5OrderService.java b/ruoyi-mall/src/main/java/com/cyl/h5/service/H5OrderService.java index 940ceb0..85a7d47 100644 --- a/ruoyi-mall/src/main/java/com/cyl/h5/service/H5OrderService.java +++ b/ruoyi-mall/src/main/java/com/cyl/h5/service/H5OrderService.java @@ -192,6 +192,7 @@ public class H5OrderService { order.setAftersaleStatus(1); order.setReceiverName(memberAddress.getName()); order.setReceiverPhone(memberAddress.getPhoneHidden()); + order.setReceiverPhoneEncrypted(memberAddress.getPhoneEncrypted()); order.setReceiverPostCode(memberAddress.getPostCode()); order.setReceiverProvince(memberAddress.getProvince()); order.setReceiverCity(memberAddress.getCity()); diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/oms/controller/OrderController.java b/ruoyi-mall/src/main/java/com/cyl/manager/oms/controller/OrderController.java index da55b93..d3f101d 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/oms/controller/OrderController.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/oms/controller/OrderController.java @@ -1,41 +1,30 @@ package com.cyl.manager.oms.controller; -import java.util.List; - -import com.cyl.h5.config.SecurityUtil; +import com.cyl.manager.oms.convert.OrderConvert; +import com.cyl.manager.oms.domain.Order; +import com.cyl.manager.oms.pojo.query.OrderQuery; import com.cyl.manager.oms.pojo.request.DeliverProductRequest; import com.cyl.manager.oms.pojo.request.ManagerOrderQueryRequest; import com.cyl.manager.oms.pojo.vo.ManagerOrderDetailVO; import com.cyl.manager.oms.pojo.vo.ManagerOrderVO; import com.cyl.manager.oms.pojo.vo.OrderOperateHistoryVO; +import com.cyl.manager.oms.service.OrderService; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.redis.RedisService; +import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.utils.SecurityUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; -import org.springframework.data.domain.PageImpl; -import org.springframework.data.domain.Pageable; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; import org.springframework.http.ResponseEntity; import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.enums.BusinessType; -import com.cyl.manager.oms.convert.OrderConvert; -import com.cyl.manager.oms.domain.Order; -import com.cyl.manager.oms.pojo.query.OrderQuery; -import com.cyl.manager.oms.service.OrderService; -import com.cyl.manager.oms.pojo.vo.OrderVO; -import com.ruoyi.common.utils.poi.ExcelUtil; +import org.springframework.web.bind.annotation.*; + +import java.util.List; /** * 订单表Controller * @@ -139,4 +128,10 @@ public class OrderController extends BaseController { return ResponseEntity.ok(service.log(orderId)); } + @ApiOperation("订单解密") + @GetMapping("/decryptPhone/{orderId}") + public ResponseEntity decryptPhone(@PathVariable Long orderId){ + String decryptPhone = service.decryptPhone(orderId); + return ResponseEntity.ok(decryptPhone); + } } diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/Order.java b/ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/Order.java index 97710e0..8a4aee8 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/Order.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/Order.java @@ -1,16 +1,16 @@ package com.cyl.manager.oms.domain; -import java.math.BigDecimal; -import java.time.LocalDateTime; - import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseAudit; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import com.ruoyi.common.core.domain.BaseAudit; import lombok.Data; -import com.baomidou.mybatisplus.annotation.TableName; + +import java.math.BigDecimal; +import java.time.LocalDateTime; /** * 订单表对象 oms_order * @@ -89,6 +89,10 @@ public class Order extends BaseAudit { @Excel(name = "收货人电话") private String receiverPhone; + @ApiModelProperty("加密的手机号") + @Excel(name = "加密的手机号") + private String receiverPhoneEncrypted; + @ApiModelProperty("收货人邮编") @Excel(name = "收货人邮编") private String receiverPostCode; diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/oms/service/OrderService.java b/ruoyi-mall/src/main/java/com/cyl/manager/oms/service/OrderService.java index 34c7205..04f9be1 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/oms/service/OrderService.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/oms/service/OrderService.java @@ -369,4 +369,14 @@ public class OrderService { List historyList = orderOperateHistoryMapper.selectList(wrapper); return historyConvert.dos2vos(historyList); } + + public String decryptPhone(Long orderId) { + Order order = orderMapper.selectById(orderId); + String receiverPhoneEncrypted = order.getReceiverPhoneEncrypted(); + if(receiverPhoneEncrypted!=null){ + return AesCryptoUtils.decrypt(aesKey,receiverPhoneEncrypted); + }else { + return null; + } + } }