目录结构优化

ruoyi-mall/src/main/java/com/cyl/h5/controller/H5MemberController.java

@@ -1,10 +1,9 @@
 package com.cyl.h5.controller;
 
 import com.alibaba.fastjson.JSON;
-import com.cyl.h5.domain.vo.H5LoginVO;
 import com.cyl.h5.domain.form.RegisterForm;
-import com.cyl.h5.domain.vo.RegisterResponse;
-import com.cyl.h5.domain.vo.ValidatePhoneResponse;
+import com.cyl.h5.domain.vo.RegisterVO;
+import com.cyl.h5.domain.vo.ValidatePhoneVO;
 import com.cyl.h5.domain.vo.H5LoginResponse;
 import com.cyl.h5.service.H5MemberService;
 import com.cyl.manager.ums.domain.vo.MemberVO;
@@ -31,13 +30,13 @@ public class H5MemberController {
 
     @ApiOperation("会员注册")
     @PostMapping("/register")
-    public ResponseEntity<RegisterResponse> register(@RequestBody RegisterForm request){
+    public ResponseEntity<RegisterVO> register(@RequestBody RegisterForm request){
         return ResponseEntity.ok(service.register(request));
     }
 
     @ApiOperation("注册登录验证码校验手机号")
     @GetMapping("/validate/{phone}")
-    public ResponseEntity<ValidatePhoneResponse> validate(@PathVariable String phone){
+    public ResponseEntity<ValidatePhoneVO> validate(@PathVariable String phone){
         return ResponseEntity.ok(service.validate(phone));
     }
 

ruoyi-mall/src/main/java/com/cyl/h5/controller/H5OrderController.java

@@ -5,7 +5,7 @@ import com.cyl.h5.domain.form.ApplyRefundForm;
 import com.cyl.h5.domain.form.OrderCreateForm;
 import com.cyl.h5.domain.form.CancelOrderForm;
 import com.cyl.h5.domain.form.OrderPayForm;
-import com.cyl.h5.domain.vo.OrderPayResponse;
+import com.cyl.h5.domain.vo.OrderPayVO;
 import com.cyl.h5.domain.vo.AftersaleRefundInfoVO;
 import com.cyl.h5.domain.vo.CountOrderVO;
 import com.cyl.h5.domain.vo.H5OrderVO;
@@ -129,7 +129,7 @@ public class H5OrderController {
 
     @ApiOperation("订单支付")
     @PostMapping("/orderPay")
-    public ResponseEntity<OrderPayResponse> orderPay(@RequestBody OrderPayForm req){
+    public ResponseEntity<OrderPayVO> orderPay(@RequestBody OrderPayForm req){
         log.info("订单支付","提交的数据："+JSONObject.toJSONString(req));
         String redisKey = "h5_oms_order_pay_"+req.getPayId();
         String redisValue = req.getPayId()+"_"+System.currentTimeMillis();

ruoyi-mall/src/main/java/com/cyl/h5/controller/H5ProductController.java

@@ -1,7 +1,7 @@
 package com.cyl.h5.controller;
 
 import com.cyl.h5.domain.vo.H5ProductVO;
-import com.cyl.h5.domain.vo.ProductDetail;
+import com.cyl.h5.domain.vo.ProductDetailVO;
 import com.cyl.manager.pms.convert.ProductConvert;
 import com.cyl.manager.pms.domain.entity.Product;
 import com.cyl.manager.pms.domain.query.ProductQuery;
@@ -29,8 +29,8 @@ public class H5ProductController {
         return ResponseEntity.ok(new PageImpl<>(productConvert.dos2dtos(pageRes), page, ((com.github.pagehelper.Page) pageRes).getTotal()));
     }
     @GetMapping("/detail/{id}")
-    public ResponseEntity<ProductDetail> queryDetail(@PathVariable Long id) {
-        ProductDetail detail = productService.queryDetail(id);
+    public ResponseEntity<ProductDetailVO> queryDetail(@PathVariable Long id) {
+        ProductDetailVO detail = productService.queryDetail(id);
         return ResponseEntity.ok(detail);
     }
 }

ruoyi-mall/src/main/java/com/cyl/h5/domain/vo/H5LoginResponse.java

@@ -1,13 +0,0 @@
-package com.cyl.h5.domain.vo;
-
-import lombok.Data;
-
-/**
- * @Author: czc
- * @Description: TODO
- * @DateTime: 2023/6/16 14:54
- **/
-@Data
-public class H5LoginResponse {
-    private String token;
-}

ruoyi-mall/src/main/java/com/cyl/h5/domain/vo/H5LoginVO.java

@@ -2,11 +2,10 @@ package com.cyl.h5.domain.vo;
 
 import lombok.Data;
 
+/**
+ * todo 写法不规范，可以简化，没必要造一个类来处理
+ */
 @Data
 public class H5LoginVO {
-
-  private String data;
-  private String key;
-  private String sessionKey;
-  private String openId;
+    private String token;
 }

ruoyi-mall/src/main/java/com/cyl/h5/domain/vo/OrderCalcVO.java

@@ -11,7 +11,7 @@ import java.util.List;
 @ApiModel("下单前校验返回数据")
 public class OrderCalcVO {
     @ApiModelProperty("sku数据")
-    private List<SkuViewDTO> skuList;
+    private List<SkuViewVO> skuList;
     @ApiModelProperty("商品总金额")
     private BigDecimal productTotalAmount;
     @ApiModelProperty("订单总金额")

ruoyi-mall/src/main/java/com/cyl/h5/domain/vo/OrderPayVO.java

@@ -9,7 +9,7 @@ import lombok.Data;
  */
 @Data
 @ApiModel("支付响应")
-public class OrderPayResponse {
+public class OrderPayVO {
     @ApiModelProperty(value = "支付方式：1-支付宝，2-微信（默认）", dataType = "Integer")
     private Integer payType;
 
@@ -22,6 +22,9 @@ public class OrderPayResponse {
     @ApiModelProperty("signType")
     private String signType;
 
+    /**
+     * TODO 变量名命名不规范
+     */
     @ApiModelProperty("package")
     private String package_;
 

ruoyi-mall/src/main/java/com/cyl/h5/domain/vo/ProductDetailVO.java

@@ -8,7 +8,7 @@ import lombok.Data;
 import java.util.List;
 
 @Data
-public class ProductDetail {
+public class ProductDetailVO {
     private Product product;
     private List<Sku> skus;
     private Brand brand;

ruoyi-mall/src/main/java/com/cyl/h5/domain/vo/RegisterResponse.java

@@ -1,9 +0,0 @@
-package com.cyl.h5.domain.vo;
-
-import lombok.Data;
-
-@Data
-public class RegisterResponse {
-    /** token */
-    private String token;
-}

ruoyi-mall/src/main/java/com/cyl/h5/domain/vo/RegisterVO.java

@@ -0,0 +1,12 @@
+package com.cyl.h5.domain.vo;
+
+import lombok.Data;
+
+/**
+ * todo 写法不规范，可以简化，没必要造一个类来处理
+ */
+@Data
+public class RegisterVO {
+    /** token */
+    private String token;
+}

ruoyi-mall/src/main/java/com/cyl/h5/domain/vo/SkuViewVO.java

@@ -14,7 +14,7 @@ import java.math.BigDecimal;
  */
 @Data
 @ApiModel(value = "sku渲染详情")
-public class SkuViewDTO {
+public class SkuViewVO {
     private Long productId;
     private Long skuId;
     @ApiModelProperty(value = "商品名称")

ruoyi-mall/src/main/java/com/cyl/h5/domain/vo/ValidatePhoneVO.java

@@ -2,8 +2,11 @@ package com.cyl.h5.domain.vo;
 
 import lombok.Data;
 
+/**
+ * todo 写法不规范，可以简化，没必要造一个类来处理
+ */
 @Data
-public class ValidatePhoneResponse {
+public class ValidatePhoneVO {
     /** 是否成功 */
     private boolean ifSuccess;
     /** 消息 */

ruoyi-mall/src/main/java/com/cyl/h5/service/H5MemberService.java

@@ -6,13 +6,12 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.cyl.config.AESForWeixinGetPhoneNumber;
-import com.cyl.h5.domain.vo.H5LoginVO;
 import com.cyl.h5.domain.form.BindOpenIDForm;
 import com.cyl.h5.domain.form.H5AccountLoginForm;
 import com.cyl.h5.domain.form.H5SmsLoginForm;
 import com.cyl.h5.domain.form.RegisterForm;
-import com.cyl.h5.domain.vo.RegisterResponse;
-import com.cyl.h5.domain.vo.ValidatePhoneResponse;
+import com.cyl.h5.domain.vo.RegisterVO;
+import com.cyl.h5.domain.vo.ValidatePhoneVO;
 import com.cyl.h5.domain.vo.H5LoginResponse;
 import com.cyl.manager.ums.domain.entity.Member;
 import com.cyl.manager.ums.domain.entity.MemberLogininfor;
@@ -79,9 +78,9 @@ public class H5MemberService {
      * @return 结果
      */
     @Transactional
-    public RegisterResponse register(RegisterForm request){
+    public RegisterVO register(RegisterForm request){
         LocalDateTime optDate = LocalDateTime.now();
-        RegisterResponse response = new RegisterResponse();
+        RegisterVO response = new RegisterVO();
         //校验验证码
         this.validateVerifyCode(request.getUuid(), request.getMobile(), request.getCode());
         //创建会员
@@ -120,8 +119,8 @@ public class H5MemberService {
         return response;
     }
 
-    public ValidatePhoneResponse validate(String phone) {
-        ValidatePhoneResponse response = new ValidatePhoneResponse();
+    public ValidatePhoneVO validate(String phone) {
+        ValidatePhoneVO response = new ValidatePhoneVO();
         byte[] decodedBytes = Base64.getDecoder().decode(phone);
         phone = new String(decodedBytes);
         QueryWrapper<Member> qw = new QueryWrapper<>();

ruoyi-mall/src/main/java/com/cyl/h5/service/H5OrderService.java

@@ -14,7 +14,7 @@ import com.cyl.h5.domain.dto.OrderProductListDTO;
 import com.cyl.h5.domain.dto.PayNotifyMessageDTO;
 import com.cyl.h5.domain.form.CancelOrderForm;
 import com.cyl.h5.domain.form.OrderPayForm;
-import com.cyl.h5.domain.vo.OrderPayResponse;
+import com.cyl.h5.domain.vo.OrderPayVO;
 import com.cyl.h5.domain.vo.*;
 import com.cyl.h5.domain.form.OrderSubmitForm;
 import com.cyl.manager.act.service.IntegralHistoryService;
@@ -246,7 +246,7 @@ public class H5OrderService {
 
     public OrderCalcVO addOrderCheck(OrderCreateForm orderCreateForm) {
         OrderCalcVO res = new OrderCalcVO();
-        List<SkuViewDTO> skuList = new ArrayList<>();
+        List<SkuViewVO> skuList = new ArrayList<>();
         List<OrderProductListDTO> list = orderCreateForm.getSkuList();
         if (CollectionUtil.isEmpty(list)){
             throw new RuntimeException("商品SKU信息不能为空");
@@ -281,15 +281,15 @@ public class H5OrderService {
             productTotalAmount = productTotalAmount.add(addAmount);
             orderTotalAmount = orderTotalAmount.add(addAmount);
             //封装sku信息
-            SkuViewDTO skuViewDTO = new SkuViewDTO();
-            skuViewDTO.setPic(product.getPic());
-            skuViewDTO.setPrice(sku.getPrice());
-            skuViewDTO.setProductId(product.getId());
-            skuViewDTO.setProductName(product.getName());
-            skuViewDTO.setQuantity(quantityMap.get(sku.getId()));
-            skuViewDTO.setSkuId(sku.getId());
-            skuViewDTO.setSpData(sku.getSpData());
-            skuList.add(skuViewDTO);
+            SkuViewVO skuViewVO = new SkuViewVO();
+            skuViewVO.setPic(product.getPic());
+            skuViewVO.setPrice(sku.getPrice());
+            skuViewVO.setProductId(product.getId());
+            skuViewVO.setProductName(product.getName());
+            skuViewVO.setQuantity(quantityMap.get(sku.getId()));
+            skuViewVO.setSkuId(sku.getId());
+            skuViewVO.setSpData(sku.getSpData());
+            skuList.add(skuViewVO);
         }
         res.setSkuList(skuList);
         res.setOrderTotalAmount(orderTotalAmount);
@@ -498,7 +498,7 @@ public class H5OrderService {
      * @param req 支付请求
      * @return
      */
-    public OrderPayResponse orderPay(OrderPayForm req) {
+    public OrderPayVO orderPay(OrderPayForm req) {
         QueryWrapper<Order> qw = new QueryWrapper<>();
         qw.eq("pay_id", req.getPayId());
         qw.eq("status", 0);
@@ -557,7 +557,7 @@ public class H5OrderService {
                 req.getMemberId(),
                 appId
         );
-        OrderPayResponse response = new OrderPayResponse();
+        OrderPayVO response = new OrderPayVO();
         response.setPayType(2);
         String nonceStr = WechatPayUtil.generateNonceStr();
         long timeStamp = WechatPayUtil.getCurrentTimestamp();

ruoyi-mall/src/main/java/com/cyl/manager/act/constant/IntegralRule.java

@@ -1,4 +1,4 @@
-package com.cyl.manager.act.domain.vo;
+package com.cyl.manager.act.constant;
 
 import lombok.Data;
 

ruoyi-mall/src/main/java/com/cyl/manager/act/service/IntegralHistoryService.java

@@ -8,7 +8,7 @@ import java.util.List;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.cyl.h5.config.SecurityUtil;
-import com.cyl.manager.act.domain.vo.IntegralRule;
+import com.cyl.manager.act.constant.IntegralRule;
 import com.cyl.manager.act.domain.vo.IntegralStatVO;
 import com.cyl.manager.ums.domain.entity.MemberAccount;
 import com.cyl.manager.ums.mapper.MemberAccountMapper;

ruoyi-mall/src/main/java/com/cyl/manager/pms/service/ProductService.java

@@ -8,7 +8,7 @@ import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.cyl.h5.domain.vo.ProductDetail;
+import com.cyl.h5.domain.vo.ProductDetailVO;
 import com.cyl.manager.pms.convert.ProductConvert;
 import com.cyl.manager.pms.domain.entity.Sku;
 import com.cyl.manager.pms.mapper.BrandMapper;
@@ -189,8 +189,8 @@ public class ProductService {
         return productMapper.deleteById(id);
     }
 
-    public ProductDetail queryDetail(Long id) {
-        ProductDetail res = new ProductDetail();
+    public ProductDetailVO queryDetail(Long id) {
+        ProductDetailVO res = new ProductDetailVO();
         Product d = productMapper.selectById(id);
         res.setProduct(d);
         LambdaQueryWrapper<Sku> qw = new LambdaQueryWrapper<>();