xiaoning
/
yoga-app-manager
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

目录结构优化

Browse Source
pull/1/head
zccbbg 2 years ago
parent 4fd3e218b1
commit c5e93fff5e
230 changed files with 566 additions and 697 deletions
Show Stats Download Patch File Download Diff File

4
ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java
Unescape View File

@ -2,9 +2,9 @@ package com.ruoyi.web.controller.common;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.cyl.manager.ums.domain.Address; import com.cyl.manager.ums.domain.entity.Address;
import com.cyl.manager.ums.mapper.AddressMapper; import com.cyl.manager.ums.mapper.AddressMapper;
import com.cyl.manager.ums.pojo.dto.AddressDTO; import com.cyl.manager.ums.domain.dto.AddressDTO;
import com.ruoyi.common.config.RuoYiConfig; import com.ruoyi.common.config.RuoYiConfig;
import com.ruoyi.common.constant.Constants; import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.AjaxResult;

2
ruoyi-admin/src/main/java/com/ruoyi/web/core/config/H5MemberInterceptor.java
Unescape View File

@ -1,6 +1,6 @@
package com.ruoyi.web.core.config; package com.ruoyi.web.core.config;
import com.cyl.manager.ums.domain.Member; import com.cyl.manager.ums.domain.entity.Member;
import com.cyl.manager.ums.service.MemberService; import com.cyl.manager.ums.service.MemberService;
import com.ruoyi.common.constant.Constants; import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.constant.HttpStatus; import com.ruoyi.common.constant.HttpStatus;

2
ruoyi-admin/src/test/java/com/fjp/lc/test/service/ServiceTest.java
Unescape View File

@ -5,7 +5,7 @@ import cn.hutool.core.util.CharsetUtil;
import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.IdUtil;
import cn.hutool.crypto.SecureUtil; import cn.hutool.crypto.SecureUtil;
import cn.hutool.crypto.symmetric.AES; import cn.hutool.crypto.symmetric.AES;
import com.cyl.h5.pojo.dto.PayNotifyMessageDTO; import com.cyl.h5.domain.dto.PayNotifyMessageDTO;
import com.cyl.h5.service.H5OrderService; import com.cyl.h5.service.H5OrderService;
import com.cyl.job.OrderJob; import com.cyl.job.OrderJob;
import com.cyl.manager.act.service.IntegralHistoryService; import com.cyl.manager.act.service.IntegralHistoryService;

2
ruoyi-admin/src/test/java/com/fjp/lc/test/service/WechatTest.java
Unescape View File

@ -1,6 +1,6 @@
package com.fjp.lc.test.service; package com.fjp.lc.test.service;
import com.cyl.h5.pojo.vo.form.WechatLoginForm; import com.cyl.h5.domain.form.WechatLoginForm;
import com.cyl.manager.ums.service.MemberWechatService; import com.cyl.manager.ums.service.MemberWechatService;
import com.ruoyi.RuoYiApplication; import com.ruoyi.RuoYiApplication;
import org.junit.Test; import org.junit.Test;

2
ruoyi-mall/src/main/java/com/cyl/h5/config/SecurityUtil.java
Unescape View File

@ -1,6 +1,6 @@
package com.cyl.h5.config; package com.cyl.h5.config;
import com.cyl.manager.ums.domain.Member; import com.cyl.manager.ums.domain.entity.Member;
import com.ruoyi.common.constant.Constants; import com.ruoyi.common.constant.Constants;
import com.ruoyi.framework.config.LocalDataUtil; import com.ruoyi.framework.config.LocalDataUtil;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;

2
ruoyi-mall/src/main/java/com/cyl/h5/controller/CategoryController.java
Unescape View File

@ -1,6 +1,6 @@
package com.cyl.h5.controller; package com.cyl.h5.controller;
import com.cyl.manager.pms.domain.ProductCategory; import com.cyl.manager.pms.domain.entity.ProductCategory;
import com.cyl.manager.pms.service.ProductCategoryService; import com.cyl.manager.pms.service.ProductCategoryService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;

7
ruoyi-mall/src/main/java/com/cyl/h5/controller/H5CommonController.java
Unescape View File

@ -2,10 +2,10 @@ package com.cyl.h5.controller;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.cyl.manager.ums.domain.Address; import com.cyl.manager.ums.domain.entity.Address;
import com.cyl.manager.ums.domain.Feedback; import com.cyl.manager.ums.domain.entity.Feedback;
import com.cyl.manager.ums.mapper.AddressMapper; import com.cyl.manager.ums.mapper.AddressMapper;
import com.cyl.manager.ums.pojo.dto.AddressDTO; import com.cyl.manager.ums.domain.dto.AddressDTO;
import com.cyl.manager.ums.service.FeedbackService; import com.cyl.manager.ums.service.FeedbackService;
import com.ruoyi.common.annotation.Log; import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.AjaxResult;
@ -17,7 +17,6 @@ import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;

12
ruoyi-mall/src/main/java/com/cyl/h5/controller/H5MemberAddressController.java
Unescape View File

@ -1,8 +1,8 @@
package com.cyl.h5.controller; package com.cyl.h5.controller;
import com.cyl.h5.service.H5MemberAddressService; import com.cyl.h5.service.H5MemberAddressService;
import com.cyl.manager.ums.pojo.dto.MemberAddressDTO; import com.cyl.manager.ums.domain.form.MemberAddressForm;
import com.cyl.manager.ums.pojo.vo.MemberAddressVO; import com.cyl.manager.ums.domain.vo.MemberAddressVO;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
@ -27,13 +27,13 @@ public class H5MemberAddressController {
} }
@PostMapping("/create") @PostMapping("/create")
public ResponseEntity<Integer> create(@RequestBody MemberAddressDTO memberAddressDTO){ public ResponseEntity<Integer> create(@RequestBody MemberAddressForm memberAddressForm){
return ResponseEntity.ok(h5MemberAddressService.insert(memberAddressDTO)); return ResponseEntity.ok(h5MemberAddressService.insert(memberAddressForm));
} }
@PutMapping("/update") @PutMapping("/update")
public ResponseEntity<Integer> update(@RequestBody MemberAddressDTO memberAddressDTO){ public ResponseEntity<Integer> update(@RequestBody MemberAddressForm memberAddressForm){
return ResponseEntity.ok(h5MemberAddressService.update(memberAddressDTO)); return ResponseEntity.ok(h5MemberAddressService.update(memberAddressForm));
} }
@GetMapping("/{id}") @GetMapping("/{id}")

8
ruoyi-mall/src/main/java/com/cyl/h5/controller/H5MemberCartController.java
Unescape View File

@ -2,10 +2,10 @@ package com.cyl.h5.controller;
import com.cyl.h5.service.H5MemberCartService; import com.cyl.h5.service.H5MemberCartService;
import com.cyl.manager.ums.convert.MemberCartConvert; import com.cyl.manager.ums.convert.MemberCartConvert;
import com.cyl.manager.ums.domain.Member; import com.cyl.manager.ums.domain.entity.Member;
import com.cyl.manager.ums.domain.MemberCart; import com.cyl.manager.ums.domain.entity.MemberCart;
import com.cyl.manager.ums.pojo.query.MemberCartQuery; import com.cyl.manager.ums.domain.query.MemberCartQuery;
import com.cyl.manager.ums.pojo.vo.MemberCartVO; import com.cyl.manager.ums.domain.vo.MemberCartVO;
import com.ruoyi.common.constant.Constants; import com.ruoyi.common.constant.Constants;
import com.ruoyi.framework.config.LocalDataUtil; import com.ruoyi.framework.config.LocalDataUtil;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;

14
ruoyi-mall/src/main/java/com/cyl/h5/controller/H5MemberController.java
Unescape View File

@ -1,13 +1,13 @@
package com.cyl.h5.controller; package com.cyl.h5.controller;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.cyl.h5.pojo.dto.H5LoginDTO; import com.cyl.h5.domain.vo.H5LoginVO;
import com.cyl.h5.pojo.request.RegisterRequest; import com.cyl.h5.domain.form.RegisterRequest;
import com.cyl.h5.pojo.response.RegisterResponse; import com.cyl.h5.domain.vo.RegisterResponse;
import com.cyl.h5.pojo.response.ValidatePhoneResponse; import com.cyl.h5.domain.vo.ValidatePhoneResponse;
import com.cyl.h5.pojo.response.H5LoginResponse; import com.cyl.h5.domain.vo.H5LoginResponse;
import com.cyl.h5.service.H5MemberService; import com.cyl.h5.service.H5MemberService;
import com.cyl.manager.ums.pojo.vo.MemberVO; import com.cyl.manager.ums.domain.vo.MemberVO;
import com.ruoyi.common.core.domain.model.LoginMember; import com.ruoyi.common.core.domain.model.LoginMember;
import com.ruoyi.framework.web.service.TokenService; import com.ruoyi.framework.web.service.TokenService;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
@ -52,7 +52,7 @@ public class H5MemberController {
if (StringUtils.isEmpty(data)) { if (StringUtils.isEmpty(data)) {
return ResponseEntity.ok(null); return ResponseEntity.ok(null);
} }
H5LoginDTO params = JSON.parseObject(new String(Base64Utils.decodeFromString(data)), H5LoginDTO.class); H5LoginVO params = JSON.parseObject(new String(Base64Utils.decodeFromString(data)), H5LoginVO.class);
return ResponseEntity.ok(service.wechatLogin(params)); return ResponseEntity.ok(service.wechatLogin(params));
} }

26
ruoyi-mall/src/main/java/com/cyl/h5/controller/H5OrderController.java
Unescape View File

@ -1,18 +1,18 @@
package com.cyl.h5.controller; package com.cyl.h5.controller;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.cyl.h5.pojo.dto.ApplyRefundDTO; import com.cyl.h5.domain.form.ApplyRefundDTO;
import com.cyl.h5.pojo.dto.OrderCreateDTO; import com.cyl.h5.domain.form.OrderCreateForm;
import com.cyl.h5.pojo.request.CancelOrderRequest; import com.cyl.h5.domain.form.CancelOrderRequest;
import com.cyl.h5.pojo.request.OrderPayRequest; import com.cyl.h5.domain.form.OrderPayRequest;
import com.cyl.h5.pojo.response.OrderPayResponse; import com.cyl.h5.domain.vo.OrderPayResponse;
import com.cyl.h5.pojo.vo.AftersaleRefundInfoVO; import com.cyl.h5.domain.vo.AftersaleRefundInfoVO;
import com.cyl.h5.pojo.vo.CountOrderVO; import com.cyl.h5.domain.vo.CountOrderVO;
import com.cyl.h5.pojo.vo.H5OrderVO; import com.cyl.h5.domain.vo.H5OrderVO;
import com.cyl.h5.pojo.vo.OrderCalcVO; import com.cyl.h5.domain.vo.OrderCalcVO;
import com.cyl.h5.pojo.vo.form.OrderSubmitForm; import com.cyl.h5.domain.form.OrderSubmitForm;
import com.cyl.h5.service.H5OrderService; import com.cyl.h5.service.H5OrderService;
import com.cyl.manager.ums.domain.Member; import com.cyl.manager.ums.domain.entity.Member;
import com.ruoyi.common.constant.Constants; import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.core.redis.RedisService; import com.ruoyi.common.core.redis.RedisService;
import com.ruoyi.framework.config.LocalDataUtil; import com.ruoyi.framework.config.LocalDataUtil;
@ -57,8 +57,8 @@ public class H5OrderController {
@ApiOperation("下单前校验") @ApiOperation("下单前校验")
@PostMapping("/addOrderCheck") @PostMapping("/addOrderCheck")
public ResponseEntity<OrderCalcVO> addOrderCheck(@RequestBody OrderCreateDTO orderCreateDTO){ public ResponseEntity<OrderCalcVO> addOrderCheck(@RequestBody OrderCreateForm orderCreateForm){
return ResponseEntity.ok(service.addOrderCheck(orderCreateDTO)); return ResponseEntity.ok(service.addOrderCheck(orderCreateForm));
} }
@ApiOperation("订单列表") @ApiOperation("订单列表")

10
ruoyi-mall/src/main/java/com/cyl/h5/controller/H5ProductController.java
Unescape View File

@ -1,10 +1,10 @@
package com.cyl.h5.controller; package com.cyl.h5.controller;
import com.cyl.h5.pojo.dto.ProductDTO; import com.cyl.h5.domain.vo.H5ProductVO;
import com.cyl.h5.pojo.vo.ProductDetail; import com.cyl.h5.domain.vo.ProductDetail;
import com.cyl.manager.pms.convert.ProductConvert; import com.cyl.manager.pms.convert.ProductConvert;
import com.cyl.manager.pms.domain.Product; import com.cyl.manager.pms.domain.entity.Product;
import com.cyl.manager.pms.pojo.query.ProductQuery; import com.cyl.manager.pms.domain.query.ProductQuery;
import com.cyl.manager.pms.service.ProductService; import com.cyl.manager.pms.service.ProductService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page; import org.springframework.data.domain.Page;
@ -24,7 +24,7 @@ public class H5ProductController {
private ProductConvert productConvert; private ProductConvert productConvert;
@PostMapping("/list") @PostMapping("/list")
public ResponseEntity<Page<ProductDTO>> queryGoodByPage(@RequestBody ProductQuery query, Pageable page) { public ResponseEntity<Page<H5ProductVO>> queryGoodByPage(@RequestBody ProductQuery query, Pageable page) {
List<Product> pageRes = productService.selectList(query, page); List<Product> pageRes = productService.selectList(query, page);
return ResponseEntity.ok(new PageImpl<>(productConvert.dos2dtos(pageRes), page, ((com.github.pagehelper.Page) pageRes).getTotal())); return ResponseEntity.ok(new PageImpl<>(productConvert.dos2dtos(pageRes), page, ((com.github.pagehelper.Page) pageRes).getTotal()));
} }

2
ruoyi-mall/src/main/java/com/cyl/h5/controller/HomeController.java
Unescape View File

@ -1,6 +1,6 @@
package com.cyl.h5.controller; package com.cyl.h5.controller;
import com.cyl.h5.pojo.vo.HomeConfigVO; import com.cyl.h5.domain.vo.HomeConfigVO;
import com.cyl.manager.pms.service.ProductCategoryService; import com.cyl.manager.pms.service.ProductCategoryService;
import com.ruoyi.system.service.ISysConfigService; import com.ruoyi.system.service.ISysConfigService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;

10
ruoyi-mall/src/main/java/com/cyl/h5/controller/PayNotifyController.java
Unescape View File

@ -2,13 +2,10 @@ package com.cyl.h5.controller;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.cyl.h5.pojo.dto.PayNotifyMessageDTO; import com.cyl.h5.domain.dto.PayNotifyMessageDTO;
import com.cyl.h5.service.H5OrderService; import com.cyl.h5.service.H5OrderService;
import com.cyl.wechat.WechatPayConfig; import com.cyl.wechat.WechatPayConfig;
import com.cyl.wechat.WechatPayData;
import com.cyl.wechat.response.WeChatPayNotify;
import com.wechat.pay.java.core.Config; import com.wechat.pay.java.core.Config;
import com.wechat.pay.java.core.RSAAutoCertificateConfig;
import com.wechat.pay.java.core.notification.NotificationConfig; import com.wechat.pay.java.core.notification.NotificationConfig;
import com.wechat.pay.java.core.notification.NotificationParser; import com.wechat.pay.java.core.notification.NotificationParser;
import com.wechat.pay.java.core.notification.RequestParam; import com.wechat.pay.java.core.notification.RequestParam;
@ -17,19 +14,14 @@ import io.swagger.annotations.Api;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.core.parameters.P;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.BufferedReader; import java.io.BufferedReader;
import java.io.IOException; import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.HashMap;
import java.util.Map;
/** /**
* 订单表Controller * 订单表Controller

4
ruoyi-mall/src/main/java/com/cyl/h5/controller/UserController.java
Unescape View File

@ -1,7 +1,7 @@
package com.cyl.h5.controller; package com.cyl.h5.controller;
import com.cyl.manager.ums.domain.MemberAddress; import com.cyl.manager.ums.domain.entity.MemberAddress;
import com.cyl.manager.ums.pojo.query.MemberAddressQuery; import com.cyl.manager.ums.domain.query.MemberAddressQuery;
import com.cyl.manager.ums.service.MemberAddressService; import com.cyl.manager.ums.service.MemberAddressService;
import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;

2
ruoyi-mall/src/main/java/com/cyl/h5/controller/WechatController2.java
Unescape View File

@ -3,7 +3,7 @@ package com.cyl.h5.controller;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.cyl.external.WechatUtil; import com.cyl.external.WechatUtil;
import com.cyl.h5.pojo.vo.form.WechatLoginForm; import com.cyl.h5.domain.form.WechatLoginForm;
import com.cyl.manager.ums.service.MemberWechatService; import com.cyl.manager.ums.service.MemberWechatService;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.AjaxResult;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;

5
ruoyi-mall/src/main/java/com/cyl/h5/pojo/dto/CategoryDTO.java → ruoyi-mall/src/main/java/com/cyl/h5/domain/dto/CategoryDTO.java
Unescape View File

@ -1,5 +1,6 @@
package com.cyl.h5.pojo.dto; package com.cyl.h5.domain.dto;
import com.cyl.h5.domain.vo.H5ProductVO;
import lombok.Data; import lombok.Data;
import java.util.List; import java.util.List;
@ -10,5 +11,5 @@ public class CategoryDTO {
private Integer sort; private Integer sort;
private String name; private String name;
private String icon; private String icon;
private List<ProductDTO> productList; private List<H5ProductVO> productList;
} }

6
ruoyi-mall/src/main/java/com/cyl/h5/pojo/dto/OrderProductListDTO.java → ruoyi-mall/src/main/java/com/cyl/h5/domain/dto/OrderProductListDTO.java
Unescape View File

@ -1,7 +1,7 @@
package com.cyl.h5.pojo.dto; package com.cyl.h5.domain.dto;
import com.cyl.manager.pms.domain.Product; import com.cyl.manager.pms.domain.entity.Product;
import com.cyl.manager.pms.domain.Sku; import com.cyl.manager.pms.domain.entity.Sku;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;

2
ruoyi-mall/src/main/java/com/cyl/h5/pojo/dto/PayNotifyMessageDTO.java → ruoyi-mall/src/main/java/com/cyl/h5/domain/dto/PayNotifyMessageDTO.java
Unescape View File

@ -1,4 +1,4 @@
package com.cyl.h5.pojo.dto; package com.cyl.h5.domain.dto;
import com.wechat.pay.java.service.partnerpayments.jsapi.model.Transaction; import com.wechat.pay.java.service.partnerpayments.jsapi.model.Transaction;
import lombok.Data; import lombok.Data;

2
ruoyi-mall/src/main/java/com/cyl/h5/pojo/dto/ApplyRefundDTO.java → ruoyi-mall/src/main/java/com/cyl/h5/domain/form/ApplyRefundDTO.java
Unescape View File

@ -1,4 +1,4 @@
package com.cyl.h5.pojo.dto; package com.cyl.h5.domain.form;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;

2
ruoyi-mall/src/main/java/com/cyl/h5/pojo/request/BindOpenIdRequest.java → ruoyi-mall/src/main/java/com/cyl/h5/domain/form/BindOpenIdRequest.java
Unescape View File

@ -1,4 +1,4 @@
package com.cyl.h5.pojo.request; package com.cyl.h5.domain.form;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;

2
ruoyi-mall/src/main/java/com/cyl/h5/pojo/request/CancelOrderRequest.java → ruoyi-mall/src/main/java/com/cyl/h5/domain/form/CancelOrderRequest.java
Unescape View File

@ -1,4 +1,4 @@
package com.cyl.h5.pojo.request; package com.cyl.h5.domain.form;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;

2
ruoyi-mall/src/main/java/com/cyl/h5/pojo/request/H5AccountLoginRequest.java → ruoyi-mall/src/main/java/com/cyl/h5/domain/form/H5AccountLoginRequest.java
Unescape View File

@ -1,4 +1,4 @@
package com.cyl.h5.pojo.request; package com.cyl.h5.domain.form;
import lombok.Data; import lombok.Data;

2
ruoyi-mall/src/main/java/com/cyl/h5/pojo/request/H5LoginRequest.java → ruoyi-mall/src/main/java/com/cyl/h5/domain/form/H5LoginRequest.java
Unescape View File

@ -1,4 +1,4 @@
package com.cyl.h5.pojo.request; package com.cyl.h5.domain.form;
import lombok.Data; import lombok.Data;

2
ruoyi-mall/src/main/java/com/cyl/h5/pojo/request/H5SmsLoginRequest.java → ruoyi-mall/src/main/java/com/cyl/h5/domain/form/H5SmsLoginRequest.java
Unescape View File

@ -1,4 +1,4 @@
package com.cyl.h5.pojo.request; package com.cyl.h5.domain.form;
import com.cyl.wechat.response.WechatUserAuth; import com.cyl.wechat.response.WechatUserAuth;
import lombok.Data; import lombok.Data;

5
ruoyi-mall/src/main/java/com/cyl/h5/pojo/dto/OrderCreateDTO.java → ruoyi-mall/src/main/java/com/cyl/h5/domain/form/OrderCreateForm.java
Unescape View File

@ -1,5 +1,6 @@
package com.cyl.h5.pojo.dto; package com.cyl.h5.domain.form;
import com.cyl.h5.domain.dto.OrderProductListDTO;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
@ -14,7 +15,7 @@
*/ */
@Data @Data
@ApiModel(value = "创建订单请求VO") @ApiModel(value = "创建订单请求VO")
public class OrderCreateDTO { public class OrderCreateForm {
@ApiModelProperty(value = "商品购买明细",required = true) @ApiModelProperty(value = "商品购买明细",required = true)
private List<OrderProductListDTO> skuList; private List<OrderProductListDTO> skuList;

2
ruoyi-mall/src/main/java/com/cyl/h5/pojo/request/OrderPayRequest.java → ruoyi-mall/src/main/java/com/cyl/h5/domain/form/OrderPayRequest.java
Unescape View File

@ -1,4 +1,4 @@
package com.cyl.h5.pojo.request; package com.cyl.h5.domain.form;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;

4
ruoyi-mall/src/main/java/com/cyl/h5/pojo/vo/form/OrderSubmitForm.java → ruoyi-mall/src/main/java/com/cyl/h5/domain/form/OrderSubmitForm.java
Unescape View File

@ -1,6 +1,6 @@
package com.cyl.h5.pojo.vo.form; package com.cyl.h5.domain.form;
import com.cyl.h5.pojo.dto.OrderProductListDTO; import com.cyl.h5.domain.dto.OrderProductListDTO;
import lombok.Data; import lombok.Data;
import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotEmpty;

2
ruoyi-mall/src/main/java/com/cyl/h5/pojo/request/RegisterRequest.java → ruoyi-mall/src/main/java/com/cyl/h5/domain/form/RegisterRequest.java
Unescape View File

@ -1,4 +1,4 @@
package com.cyl.h5.pojo.request; package com.cyl.h5.domain.form;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;

2
ruoyi-mall/src/main/java/com/cyl/h5/pojo/vo/form/WechatLoginForm.java → ruoyi-mall/src/main/java/com/cyl/h5/domain/form/WechatLoginForm.java
Unescape View File

@ -1,4 +1,4 @@
package com.cyl.h5.pojo.vo.form; package com.cyl.h5.domain.form;
import lombok.Data; import lombok.Data;

2
ruoyi-mall/src/main/java/com/cyl/h5/pojo/vo/query/OrderH5Query.java → ruoyi-mall/src/main/java/com/cyl/h5/domain/query/OrderH5Query.java
Unescape View File

@ -1,4 +1,4 @@
package com.cyl.h5.pojo.vo.query; package com.cyl.h5.domain.query;
import lombok.Data; import lombok.Data;

7
ruoyi-mall/src/main/java/com/cyl/h5/pojo/vo/AftersaleRefundInfoVO.java → ruoyi-mall/src/main/java/com/cyl/h5/domain/vo/AftersaleRefundInfoVO.java
Unescape View File

@ -1,8 +1,7 @@
package com.cyl.h5.pojo.vo; package com.cyl.h5.domain.vo;
import com.cyl.manager.oms.domain.OrderItem; import com.cyl.manager.oms.domain.vo.AftersaleItemVO;
import com.cyl.manager.oms.pojo.vo.AftersaleItemVO; import com.cyl.manager.oms.domain.vo.OrderItemVO;
import com.cyl.manager.oms.pojo.vo.OrderItemVO;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseAudit; import com.ruoyi.common.core.domain.BaseAudit;

2
ruoyi-mall/src/main/java/com/cyl/h5/pojo/vo/CountOrderVO.java → ruoyi-mall/src/main/java/com/cyl/h5/domain/vo/CountOrderVO.java
Unescape View File

@ -1,4 +1,4 @@
package com.cyl.h5.pojo.vo; package com.cyl.h5.domain.vo;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;

2
ruoyi-mall/src/main/java/com/cyl/h5/pojo/response/H5LoginResponse.java → ruoyi-mall/src/main/java/com/cyl/h5/domain/vo/H5LoginResponse.java
Unescape View File

@ -1,4 +1,4 @@
package com.cyl.h5.pojo.response; package com.cyl.h5.domain.vo;
import lombok.Data; import lombok.Data;

4
ruoyi-mall/src/main/java/com/cyl/h5/pojo/dto/H5LoginDTO.java → ruoyi-mall/src/main/java/com/cyl/h5/domain/vo/H5LoginVO.java
Unescape View File

@ -1,9 +1,9 @@
package com.cyl.h5.pojo.dto; package com.cyl.h5.domain.vo;
import lombok.Data; import lombok.Data;
@Data @Data
public class H5LoginDTO { public class H5LoginVO {
private String data; private String data;
private String key; private String key;

4
ruoyi-mall/src/main/java/com/cyl/h5/pojo/vo/H5OrderVO.java → ruoyi-mall/src/main/java/com/cyl/h5/domain/vo/H5OrderVO.java
Unescape View File

@ -1,6 +1,6 @@
package com.cyl.h5.pojo.vo; package com.cyl.h5.domain.vo;
import com.cyl.manager.oms.domain.OrderItem; import com.cyl.manager.oms.domain.entity.OrderItem;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;

4
ruoyi-mall/src/main/java/com/cyl/h5/pojo/dto/ProductDTO.java → ruoyi-mall/src/main/java/com/cyl/h5/domain/vo/H5ProductVO.java
Unescape View File

@ -1,10 +1,10 @@
package com.cyl.h5.pojo.dto; package com.cyl.h5.domain.vo;
import lombok.Data; import lombok.Data;
import java.math.BigDecimal; import java.math.BigDecimal;
@Data @Data
public class ProductDTO { public class H5ProductVO {
private Long id; private Long id;
private String pic; private String pic;
private String name; private String name;

4
ruoyi-mall/src/main/java/com/cyl/h5/pojo/vo/HomeConfigVO.java → ruoyi-mall/src/main/java/com/cyl/h5/domain/vo/HomeConfigVO.java
Unescape View File

@ -1,6 +1,6 @@
package com.cyl.h5.pojo.vo; package com.cyl.h5.domain.vo;
import com.cyl.h5.pojo.dto.CategoryDTO; import com.cyl.h5.domain.dto.CategoryDTO;
import lombok.Data; import lombok.Data;
import java.util.List; import java.util.List;

2
ruoyi-mall/src/main/java/com/cyl/h5/pojo/vo/OrderCalcVO.java → ruoyi-mall/src/main/java/com/cyl/h5/domain/vo/OrderCalcVO.java
Unescape View File

@ -1,4 +1,4 @@
package com.cyl.h5.pojo.vo; package com.cyl.h5.domain.vo;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;

2
ruoyi-mall/src/main/java/com/cyl/h5/pojo/response/OrderPayResponse.java → ruoyi-mall/src/main/java/com/cyl/h5/domain/vo/OrderPayResponse.java
Unescape View File

@ -1,4 +1,4 @@
package com.cyl.h5.pojo.response; package com.cyl.h5.domain.vo;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;

15
ruoyi-mall/src/main/java/com/cyl/h5/domain/vo/ProductDetail.java
Unescape View File

@ -0,0 +1,15 @@
package com.cyl.h5.domain.vo;
import com.cyl.manager.pms.domain.entity.Brand;
import com.cyl.manager.pms.domain.entity.Product;
import com.cyl.manager.pms.domain.entity.Sku;
import lombok.Data;
import java.util.List;
@Data
public class ProductDetail {
private Product product;
private List<Sku> skus;
private Brand brand;
}

2
ruoyi-mall/src/main/java/com/cyl/h5/pojo/response/RegisterResponse.java → ruoyi-mall/src/main/java/com/cyl/h5/domain/vo/RegisterResponse.java
Unescape View File

@ -1,4 +1,4 @@
package com.cyl.h5.pojo.response; package com.cyl.h5.domain.vo;
import lombok.Data; import lombok.Data;

2
ruoyi-mall/src/main/java/com/cyl/h5/pojo/vo/SkuViewDTO.java → ruoyi-mall/src/main/java/com/cyl/h5/domain/vo/SkuViewDTO.java
Unescape View File

@ -1,4 +1,4 @@
package com.cyl.h5.pojo.vo; package com.cyl.h5.domain.vo;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;

2
ruoyi-mall/src/main/java/com/cyl/h5/pojo/response/ValidatePhoneResponse.java → ruoyi-mall/src/main/java/com/cyl/h5/domain/vo/ValidatePhoneResponse.java
Unescape View File

@ -1,4 +1,4 @@
package com.cyl.h5.pojo.response; package com.cyl.h5.domain.vo;
import lombok.Data; import lombok.Data;

14
ruoyi-mall/src/main/java/com/cyl/h5/pojo/dto/LoginDTO.java
Unescape View File

@ -1,14 +0,0 @@
package com.cyl.h5.pojo.dto;
import lombok.Data;
/**
* @Author: czc
* @Description: TODO
* @DateTime: 2023/6/16 14:58
**/
@Data
public class LoginDTO {
private String account;
private String password;
}

29
ruoyi-mall/src/main/java/com/cyl/h5/pojo/dto/MicroMallOrderSyncMsg.java
Unescape View File

@ -1,29 +0,0 @@
package com.cyl.h5.pojo.dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;
/**
* @author: Jinxin
* @date: 2023/4/16 10:22
* @Description:
*/
@Getter
@Setter
public class MicroMallOrderSyncMsg {
@ApiModelProperty(
name = "orderId",
value = "订单id",
required = true,
dataType = "String"
)
private Long orderId;
@ApiModelProperty(
name = "type",
value = "type 0延时关闭 1新下单 2退款",
required = true,
dataType = "Integer"
)
private Integer type;
}

15
ruoyi-mall/src/main/java/com/cyl/h5/pojo/vo/ProductDetail.java
Unescape View File

@ -1,15 +0,0 @@
package com.cyl.h5.pojo.vo;
import com.cyl.manager.pms.domain.Brand;
import com.cyl.manager.pms.domain.Product;
import com.cyl.manager.pms.domain.Sku;
import lombok.Data;
import java.util.List;
@Data
public class ProductDetail {
private Product product;
private List<Sku> skus;
private Brand brand;
}

32
ruoyi-mall/src/main/java/com/cyl/h5/service/H5MemberAddressService.java
Unescape View File

@ -1,11 +1,11 @@
package com.cyl.h5.service; package com.cyl.h5.service;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.cyl.manager.ums.domain.Member; import com.cyl.manager.ums.domain.entity.Member;
import com.cyl.manager.ums.domain.MemberAddress; import com.cyl.manager.ums.domain.entity.MemberAddress;
import com.cyl.manager.ums.mapper.MemberAddressMapper; import com.cyl.manager.ums.mapper.MemberAddressMapper;
import com.cyl.manager.ums.pojo.dto.MemberAddressDTO; import com.cyl.manager.ums.domain.form.MemberAddressForm;
import com.cyl.manager.ums.pojo.vo.MemberAddressVO; import com.cyl.manager.ums.domain.vo.MemberAddressVO;
import com.ruoyi.common.constant.Constants; import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.utils.AesCryptoUtils; import com.ruoyi.common.utils.AesCryptoUtils;
import com.ruoyi.common.utils.PhoneUtils; import com.ruoyi.common.utils.PhoneUtils;
@ -67,19 +67,19 @@ public class H5MemberAddressService {
/** /**
* 新增会员收货地址 * 新增会员收货地址
* *
* @param memberAddressDTO 会员收货地址 * @param memberAddressForm 会员收货地址
* @return 结果 * @return 结果
*/ */
public int insert(MemberAddressDTO memberAddressDTO) { public int insert(MemberAddressForm memberAddressForm) {
Member member = (Member) LocalDataUtil.getVar(Constants.MEMBER_INFO); Member member = (Member) LocalDataUtil.getVar(Constants.MEMBER_INFO);
if (memberAddressDTO.getIsDefault() == 1) { if (memberAddressForm.getIsDefault() == 1) {
//将别的设置为0 //将别的设置为0
memberAddressMapper.updateDefault(0,member.getId()); memberAddressMapper.updateDefault(0,member.getId());
} }
MemberAddress memberAddress = new MemberAddress(); MemberAddress memberAddress = new MemberAddress();
BeanUtils.copyProperties(memberAddressDTO, memberAddress); BeanUtils.copyProperties(memberAddressForm, memberAddress);
memberAddress.setPhoneHidden(PhoneUtils.hidePhone(memberAddressDTO.getPhone())); memberAddress.setPhoneHidden(PhoneUtils.hidePhone(memberAddressForm.getPhone()));
memberAddress.setPhoneEncrypted(AesCryptoUtils.encrypt(aesKey, memberAddressDTO.getPhone())); memberAddress.setPhoneEncrypted(AesCryptoUtils.encrypt(aesKey, memberAddressForm.getPhone()));
memberAddress.setMemberId(member.getId()); memberAddress.setMemberId(member.getId());
memberAddress.setCreateTime(LocalDateTime.now()); memberAddress.setCreateTime(LocalDateTime.now());
return memberAddressMapper.insert(memberAddress); return memberAddressMapper.insert(memberAddress);
@ -88,20 +88,20 @@ public class H5MemberAddressService {
/** /**
* 修改会员收货地址 * 修改会员收货地址
* *
* @param memberAddressDTO 会员收货地址 * @param memberAddressForm 会员收货地址
* @return 结果 * @return 结果
*/ */
public int update(MemberAddressDTO memberAddressDTO) { public int update(MemberAddressForm memberAddressForm) {
Member member = (Member) LocalDataUtil.getVar(Constants.MEMBER_INFO); Member member = (Member) LocalDataUtil.getVar(Constants.MEMBER_INFO);
if (memberAddressDTO.getIsDefault() == 1) { if (memberAddressForm.getIsDefault() == 1) {
//将别的设置为0 //将别的设置为0
memberAddressMapper.updateDefault(0,member.getId()); memberAddressMapper.updateDefault(0,member.getId());
} }
MemberAddress memberAddress = new MemberAddress(); MemberAddress memberAddress = new MemberAddress();
BeanUtils.copyProperties(memberAddressDTO, memberAddress); BeanUtils.copyProperties(memberAddressForm, memberAddress);
memberAddress.setPhoneHidden(PhoneUtils.hidePhone(memberAddressDTO.getPhone())); memberAddress.setPhoneHidden(PhoneUtils.hidePhone(memberAddressForm.getPhone()));
memberAddress.setPhoneEncrypted(AesCryptoUtils.encrypt(aesKey, memberAddressDTO.getPhone())); memberAddress.setPhoneEncrypted(AesCryptoUtils.encrypt(aesKey, memberAddressForm.getPhone()));
memberAddress.setUpdateTime(LocalDateTime.now()); memberAddress.setUpdateTime(LocalDateTime.now());
memberAddress.setUpdateBy(member.getId()); memberAddress.setUpdateBy(member.getId());
return memberAddressMapper.updateById(memberAddress); return memberAddressMapper.updateById(memberAddress);

12
ruoyi-mall/src/main/java/com/cyl/h5/service/H5MemberCartService.java
Unescape View File

@ -4,16 +4,16 @@ import cn.hutool.core.collection.CollectionUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.cyl.h5.config.SecurityUtil; import com.cyl.h5.config.SecurityUtil;
import com.cyl.manager.pms.domain.Sku; import com.cyl.manager.pms.domain.entity.Sku;
import com.cyl.manager.pms.mapper.ProductMapper; import com.cyl.manager.pms.mapper.ProductMapper;
import com.cyl.manager.pms.mapper.SkuMapper; import com.cyl.manager.pms.mapper.SkuMapper;
import com.cyl.manager.ums.convert.MemberCartConvert; import com.cyl.manager.ums.convert.MemberCartConvert;
import com.cyl.manager.ums.domain.Member; import com.cyl.manager.ums.domain.entity.Member;
import com.cyl.manager.ums.domain.MemberCart; import com.cyl.manager.ums.domain.entity.MemberCart;
import com.cyl.manager.ums.mapper.MemberCartMapper; import com.cyl.manager.ums.mapper.MemberCartMapper;
import com.cyl.manager.ums.pojo.query.MemberCartQuery; import com.cyl.manager.ums.domain.query.MemberCartQuery;
import com.cyl.manager.ums.pojo.vo.MemberCartVO; import com.cyl.manager.ums.domain.vo.MemberCartVO;
import com.cyl.manager.ums.pojo.vo.form.UpdateMemberCartForm; import com.cyl.manager.ums.domain.vo.form.UpdateMemberCartForm;
import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageHelper;
import com.ruoyi.common.constant.Constants; import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.exception.base.BaseException; import com.ruoyi.common.exception.base.BaseException;

27
ruoyi-mall/src/main/java/com/cyl/h5/service/H5MemberService.java
Unescape View File

@ -1,27 +1,26 @@
package com.cyl.h5.service; package com.cyl.h5.service;
import cn.hutool.core.util.StrUtil;
import cn.hutool.json.JSONUtil; import cn.hutool.json.JSONUtil;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.cyl.config.AESForWeixinGetPhoneNumber; import com.cyl.config.AESForWeixinGetPhoneNumber;
import com.cyl.h5.pojo.dto.H5LoginDTO; import com.cyl.h5.domain.vo.H5LoginVO;
import com.cyl.h5.pojo.request.BindOpenIdRequest; import com.cyl.h5.domain.form.BindOpenIdRequest;
import com.cyl.h5.pojo.request.H5AccountLoginRequest; import com.cyl.h5.domain.form.H5AccountLoginRequest;
import com.cyl.h5.pojo.request.H5SmsLoginRequest; import com.cyl.h5.domain.form.H5SmsLoginRequest;
import com.cyl.h5.pojo.request.RegisterRequest; import com.cyl.h5.domain.form.RegisterRequest;
import com.cyl.h5.pojo.response.RegisterResponse; import com.cyl.h5.domain.vo.RegisterResponse;
import com.cyl.h5.pojo.response.ValidatePhoneResponse; import com.cyl.h5.domain.vo.ValidatePhoneResponse;
import com.cyl.h5.pojo.response.H5LoginResponse; import com.cyl.h5.domain.vo.H5LoginResponse;
import com.cyl.manager.ums.domain.Member; import com.cyl.manager.ums.domain.entity.Member;
import com.cyl.manager.ums.domain.MemberLogininfor; import com.cyl.manager.ums.domain.entity.MemberLogininfor;
import com.cyl.manager.ums.domain.MemberWechat; import com.cyl.manager.ums.domain.entity.MemberWechat;
import com.cyl.manager.ums.mapper.MemberLogininforMapper; import com.cyl.manager.ums.mapper.MemberLogininforMapper;
import com.cyl.manager.ums.mapper.MemberMapper; import com.cyl.manager.ums.mapper.MemberMapper;
import com.cyl.manager.ums.mapper.MemberWechatMapper; import com.cyl.manager.ums.mapper.MemberWechatMapper;
import com.cyl.manager.ums.pojo.vo.MemberVO; import com.cyl.manager.ums.domain.vo.MemberVO;
import com.cyl.manager.ums.service.MemberLogininforService; import com.cyl.manager.ums.service.MemberLogininforService;
import com.cyl.wechat.WechatAuthService; import com.cyl.wechat.WechatAuthService;
import com.cyl.wechat.response.WechatUserAuth; import com.cyl.wechat.response.WechatUserAuth;
@ -342,7 +341,7 @@ public class H5MemberService {
memberLogininforMapper.insert(memberLogininfor); memberLogininforMapper.insert(memberLogininfor);
} }
public H5LoginResponse wechatLogin(H5LoginDTO params) throws Exception { public H5LoginResponse wechatLogin(H5LoginVO params) throws Exception {
String openId = params.getOpenId(); String openId = params.getOpenId();
String sessionKey = params.getSessionKey(); String sessionKey = params.getSessionKey();
//解密手机号 //解密手机号

36
ruoyi-mall/src/main/java/com/cyl/h5/service/H5OrderService.java
Unescape View File

@ -8,30 +8,30 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.cyl.h5.config.SecurityUtil; import com.cyl.h5.config.SecurityUtil;
import com.cyl.h5.pojo.dto.ApplyRefundDTO; import com.cyl.h5.domain.form.ApplyRefundDTO;
import com.cyl.h5.pojo.dto.OrderCreateDTO; import com.cyl.h5.domain.form.OrderCreateForm;
import com.cyl.h5.pojo.dto.OrderProductListDTO; import com.cyl.h5.domain.dto.OrderProductListDTO;
import com.cyl.h5.pojo.dto.PayNotifyMessageDTO; import com.cyl.h5.domain.dto.PayNotifyMessageDTO;
import com.cyl.h5.pojo.request.CancelOrderRequest; import com.cyl.h5.domain.form.CancelOrderRequest;
import com.cyl.h5.pojo.request.OrderPayRequest; import com.cyl.h5.domain.form.OrderPayRequest;
import com.cyl.h5.pojo.response.OrderPayResponse; import com.cyl.h5.domain.vo.OrderPayResponse;
import com.cyl.h5.pojo.vo.*; import com.cyl.h5.domain.vo.*;
import com.cyl.h5.pojo.vo.form.OrderSubmitForm; import com.cyl.h5.domain.form.OrderSubmitForm;
import com.cyl.manager.act.service.IntegralHistoryService; import com.cyl.manager.act.service.IntegralHistoryService;
import com.cyl.manager.oms.convert.AftersaleItemConvert; import com.cyl.manager.oms.convert.AftersaleItemConvert;
import com.cyl.manager.oms.convert.OrderItemConvert; import com.cyl.manager.oms.convert.OrderItemConvert;
import com.cyl.manager.oms.domain.*;
import com.cyl.manager.oms.mapper.*; import com.cyl.manager.oms.mapper.*;
import com.cyl.manager.oms.domain.entity.*;
import com.cyl.manager.oms.service.OrderItemService; import com.cyl.manager.oms.service.OrderItemService;
import com.cyl.manager.oms.service.OrderOperateHistoryService; import com.cyl.manager.oms.service.OrderOperateHistoryService;
import com.cyl.manager.pms.domain.Product; import com.cyl.manager.pms.domain.entity.Product;
import com.cyl.manager.pms.domain.Sku; import com.cyl.manager.pms.domain.entity.Sku;
import com.cyl.manager.pms.mapper.ProductMapper; import com.cyl.manager.pms.mapper.ProductMapper;
import com.cyl.manager.pms.mapper.SkuMapper; import com.cyl.manager.pms.mapper.SkuMapper;
import com.cyl.manager.ums.domain.Member; import com.cyl.manager.ums.domain.entity.Member;
import com.cyl.manager.ums.domain.MemberAddress; import com.cyl.manager.ums.domain.entity.MemberAddress;
import com.cyl.manager.ums.domain.MemberCart; import com.cyl.manager.ums.domain.entity.MemberCart;
import com.cyl.manager.ums.domain.MemberWechat; import com.cyl.manager.ums.domain.entity.MemberWechat;
import com.cyl.manager.ums.mapper.MemberAddressMapper; import com.cyl.manager.ums.mapper.MemberAddressMapper;
import com.cyl.manager.ums.mapper.MemberCartMapper; import com.cyl.manager.ums.mapper.MemberCartMapper;
import com.cyl.manager.ums.mapper.MemberWechatMapper; import com.cyl.manager.ums.mapper.MemberWechatMapper;
@ -244,10 +244,10 @@ public class H5OrderService {
return payId; return payId;
} }
public OrderCalcVO addOrderCheck(OrderCreateDTO orderCreateDTO) { public OrderCalcVO addOrderCheck(OrderCreateForm orderCreateForm) {
OrderCalcVO res = new OrderCalcVO(); OrderCalcVO res = new OrderCalcVO();
List<SkuViewDTO> skuList = new ArrayList<>(); List<SkuViewDTO> skuList = new ArrayList<>();
List<OrderProductListDTO> list = orderCreateDTO.getSkuList(); List<OrderProductListDTO> list = orderCreateForm.getSkuList();
if (CollectionUtil.isEmpty(list)){ if (CollectionUtil.isEmpty(list)){
throw new RuntimeException("商品SKU信息不能为空"); throw new RuntimeException("商品SKU信息不能为空");
} }

4
ruoyi-mall/src/main/java/com/cyl/job/OrderJob.java
Unescape View File

@ -2,9 +2,9 @@ package com.cyl.job;
import cn.hutool.core.date.LocalDateTimeUtil; import cn.hutool.core.date.LocalDateTimeUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.cyl.h5.pojo.request.CancelOrderRequest; import com.cyl.h5.domain.form.CancelOrderRequest;
import com.cyl.h5.service.H5OrderService; import com.cyl.h5.service.H5OrderService;
import com.cyl.manager.oms.domain.Order; import com.cyl.manager.oms.domain.entity.Order;
import com.cyl.manager.oms.mapper.OrderMapper; import com.cyl.manager.oms.mapper.OrderMapper;
import com.ruoyi.common.constant.Constants; import com.ruoyi.common.constant.Constants;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;

2
ruoyi-mall/src/main/java/com/cyl/job/StatisticsJob.java
Unescape View File

@ -1,6 +1,6 @@
package com.cyl.job; package com.cyl.job;
import com.cyl.manager.aws.domain.SystemStatistics; import com.cyl.manager.aws.domain.entity.SystemStatistics;
import com.cyl.manager.aws.mapper.SystemStatisticsMapper; import com.cyl.manager.aws.mapper.SystemStatisticsMapper;
import com.cyl.manager.aws.service.SystemStatisticsService; import com.cyl.manager.aws.service.SystemStatisticsService;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;

6
ruoyi-mall/src/main/java/com/cyl/manager/act/controller/H5IntegralHistoryController.java
Unescape View File

@ -1,9 +1,9 @@
package com.cyl.manager.act.controller; package com.cyl.manager.act.controller;
import com.cyl.h5.config.SecurityUtil; import com.cyl.h5.config.SecurityUtil;
import com.cyl.manager.act.domain.IntegralHistory; import com.cyl.manager.act.domain.entity.IntegralHistory;
import com.cyl.manager.act.pojo.query.IntegralHistoryQuery; import com.cyl.manager.act.domain.query.IntegralHistoryQuery;
import com.cyl.manager.act.pojo.vo.IntegralStatVO; import com.cyl.manager.act.domain.vo.IntegralStatVO;
import com.cyl.manager.act.service.IntegralHistoryService; import com.cyl.manager.act.service.IntegralHistoryService;
import com.ruoyi.common.annotation.Log; import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.controller.BaseController;

35
ruoyi-mall/src/main/java/com/cyl/manager/act/controller/IntegralHistoryController.java
Unescape View File

@ -1,32 +1,25 @@
package com.cyl.manager.act.controller; package com.cyl.manager.act.controller;
import java.util.List; import com.cyl.manager.act.convert.IntegralHistoryConvert;
import com.cyl.manager.act.domain.entity.IntegralHistory;
import com.cyl.manager.act.domain.query.IntegralHistoryQuery;
import com.cyl.manager.act.domain.vo.IntegralHistoryVO;
import com.cyl.manager.act.service.IntegralHistoryService;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageImpl; import org.springframework.data.domain.PageImpl;
import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Pageable;
import org.springframework.data.domain.Page;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping; import java.util.List;
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.act.convert.IntegralHistoryConvert;
import com.cyl.manager.act.domain.IntegralHistory;
import com.cyl.manager.act.pojo.query.IntegralHistoryQuery;
import com.cyl.manager.act.service.IntegralHistoryService;
import com.cyl.manager.act.pojo.vo.IntegralHistoryVO;
import com.ruoyi.common.utils.poi.ExcelUtil;
/** /**
* 积分流水表Controller * 积分流水表Controller
* *

4
ruoyi-mall/src/main/java/com/cyl/manager/act/convert/IntegralHistoryConvert.java
Unescape View File

@ -1,8 +1,8 @@
package com.cyl.manager.act.convert; package com.cyl.manager.act.convert;
import org.mapstruct.Mapper; import org.mapstruct.Mapper;
import com.cyl.manager.act.domain.IntegralHistory; import com.cyl.manager.act.domain.entity.IntegralHistory;
import com.cyl.manager.act.pojo.vo.IntegralHistoryVO; import com.cyl.manager.act.domain.vo.IntegralHistoryVO;
import java.util.List; import java.util.List;
/** /**
* 积分流水表 DO <=> DTO <=> VO / BO / Query * 积分流水表 DO <=> DTO <=> VO / BO / Query

2
ruoyi-mall/src/main/java/com/cyl/manager/act/domain/IntegralHistory.java → ruoyi-mall/src/main/java/com/cyl/manager/act/domain/entity/IntegralHistory.java
Unescape View File

@ -1,4 +1,4 @@
package com.cyl.manager.act.domain; package com.cyl.manager.act.domain.entity;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.time.LocalDateTime; import java.time.LocalDateTime;

4
ruoyi-mall/src/main/java/com/cyl/manager/act/pojo/query/IntegralHistoryQuery.java → ruoyi-mall/src/main/java/com/cyl/manager/act/domain/query/IntegralHistoryQuery.java
Unescape View File

@ -1,4 +1,4 @@
package com.cyl.manager.act.pojo.query; package com.cyl.manager.act.domain.query;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.time.LocalDateTime; import java.time.LocalDateTime;
@ -8,8 +8,6 @@ import lombok.Data;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import javax.validation.constraints.NotBlank;
/** /**
* 积分流水表 查询 对象 * 积分流水表 查询 对象
* *

3
ruoyi-mall/src/main/java/com/cyl/manager/act/pojo/vo/IntegralHistoryVO.java → ruoyi-mall/src/main/java/com/cyl/manager/act/domain/vo/IntegralHistoryVO.java
Unescape View File

@ -1,9 +1,8 @@
package com.cyl.manager.act.pojo.vo; package com.cyl.manager.act.domain.vo;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.annotation.Excel;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data; import lombok.Data;
/** /**
* 积分流水表 数据视图对象 * 积分流水表 数据视图对象

2
ruoyi-mall/src/main/java/com/cyl/manager/act/pojo/vo/IntegralRule.java → ruoyi-mall/src/main/java/com/cyl/manager/act/domain/vo/IntegralRule.java
Unescape View File

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

2
ruoyi-mall/src/main/java/com/cyl/manager/act/pojo/vo/IntegralStatVO.java → ruoyi-mall/src/main/java/com/cyl/manager/act/domain/vo/IntegralStatVO.java
Unescape View File

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

5
ruoyi-mall/src/main/java/com/cyl/manager/act/mapper/IntegralHistoryMapper.java
Unescape View File

@ -3,9 +3,8 @@ package com.cyl.manager.act.mapper;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.List; import java.util.List;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.cyl.manager.act.pojo.vo.IntegralStatVO; import com.cyl.manager.act.domain.vo.IntegralStatVO;
import org.apache.ibatis.annotations.Param; import com.cyl.manager.act.domain.entity.IntegralHistory;
import com.cyl.manager.act.domain.IntegralHistory;
/** /**
* 积分流水表Mapper接口 * 积分流水表Mapper接口

15
ruoyi-mall/src/main/java/com/cyl/manager/act/service/IntegralHistoryService.java
Unescape View File

@ -3,31 +3,26 @@ package com.cyl.manager.act.service;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.math.RoundingMode; import java.math.RoundingMode;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.Arrays;
import java.util.List; import java.util.List;
import java.time.LocalDateTime;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.cyl.h5.config.SecurityUtil; import com.cyl.h5.config.SecurityUtil;
import com.cyl.manager.act.pojo.vo.IntegralRule; import com.cyl.manager.act.domain.vo.IntegralRule;
import com.cyl.manager.act.pojo.vo.IntegralStatVO; import com.cyl.manager.act.domain.vo.IntegralStatVO;
import com.cyl.manager.ums.domain.Member; import com.cyl.manager.ums.domain.entity.MemberAccount;
import com.cyl.manager.ums.domain.MemberAccount;
import com.cyl.manager.ums.mapper.MemberAccountMapper; import com.cyl.manager.ums.mapper.MemberAccountMapper;
import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageHelper;
import com.ruoyi.common.constant.Constants; import com.ruoyi.common.constant.Constants;
import com.ruoyi.framework.config.LocalDataUtil;
import com.ruoyi.system.service.ISysConfigService; import com.ruoyi.system.service.ISysConfigService;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Pageable;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.cyl.manager.act.mapper.IntegralHistoryMapper; import com.cyl.manager.act.mapper.IntegralHistoryMapper;
import com.cyl.manager.act.domain.IntegralHistory; import com.cyl.manager.act.domain.entity.IntegralHistory;
import com.cyl.manager.act.pojo.query.IntegralHistoryQuery; import com.cyl.manager.act.domain.query.IntegralHistoryQuery;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
/** /**

10
ruoyi-mall/src/main/java/com/cyl/manager/aws/controller/SystemStatisticsController.java
Unescape View File

@ -1,10 +1,7 @@
package com.cyl.manager.aws.controller; package com.cyl.manager.aws.controller;
import java.util.List;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.springframework.data.domain.PageImpl;
import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Pageable;
import org.springframework.data.domain.Page; import org.springframework.data.domain.Page;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
@ -22,11 +19,10 @@ import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.enums.BusinessType;
import com.cyl.manager.aws.convert.SystemStatisticsConvert; import com.cyl.manager.aws.convert.SystemStatisticsConvert;
import com.cyl.manager.aws.domain.SystemStatistics; import com.cyl.manager.aws.domain.entity.SystemStatistics;
import com.cyl.manager.aws.pojo.query.SystemStatisticsQuery; import com.cyl.manager.aws.domain.query.SystemStatisticsQuery;
import com.cyl.manager.aws.service.SystemStatisticsService; import com.cyl.manager.aws.service.SystemStatisticsService;
import com.cyl.manager.aws.pojo.vo.SystemStatisticsVO;
import com.ruoyi.common.utils.poi.ExcelUtil;
/** /**
* 系统数据统计Controller * 系统数据统计Controller
* *

4
ruoyi-mall/src/main/java/com/cyl/manager/aws/convert/SystemStatisticsConvert.java
Unescape View File

@ -1,8 +1,8 @@
package com.cyl.manager.aws.convert; package com.cyl.manager.aws.convert;
import org.mapstruct.Mapper; import org.mapstruct.Mapper;
import com.cyl.manager.aws.domain.SystemStatistics; import com.cyl.manager.aws.domain.entity.SystemStatistics;
import com.cyl.manager.aws.pojo.vo.SystemStatisticsVO; import com.cyl.manager.aws.domain.vo.SystemStatisticsVO;
import java.util.List; import java.util.List;
/** /**
* 系统数据统计 DO <=> DTO <=> VO / BO / Query * 系统数据统计 DO <=> DTO <=> VO / BO / Query

2
ruoyi-mall/src/main/java/com/cyl/manager/aws/domain/SystemStatistics.java → ruoyi-mall/src/main/java/com/cyl/manager/aws/domain/entity/SystemStatistics.java
Unescape View File

@ -1,4 +1,4 @@
package com.cyl.manager.aws.domain; package com.cyl.manager.aws.domain.entity;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.time.LocalDateTime; import java.time.LocalDateTime;

2
ruoyi-mall/src/main/java/com/cyl/manager/aws/pojo/query/SystemStatisticsQuery.java → ruoyi-mall/src/main/java/com/cyl/manager/aws/domain/query/SystemStatisticsQuery.java
Unescape View File

@ -1,4 +1,4 @@
package com.cyl.manager.aws.pojo.query; package com.cyl.manager.aws.domain.query;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.time.LocalDateTime; import java.time.LocalDateTime;

2
ruoyi-mall/src/main/java/com/cyl/manager/aws/pojo/vo/SystemStatisticsVO.java → ruoyi-mall/src/main/java/com/cyl/manager/aws/domain/vo/SystemStatisticsVO.java
Unescape View File

@ -1,4 +1,4 @@
package com.cyl.manager.aws.pojo.vo; package com.cyl.manager.aws.domain.vo;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.time.LocalDateTime; import java.time.LocalDateTime;

3
ruoyi-mall/src/main/java/com/cyl/manager/aws/mapper/SystemStatisticsMapper.java
Unescape View File

@ -2,8 +2,7 @@ package com.cyl.manager.aws.mapper;
import java.util.List; import java.util.List;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param; import com.cyl.manager.aws.domain.entity.SystemStatistics;
import com.cyl.manager.aws.domain.SystemStatistics;
/** /**
* 系统数据统计Mapper接口 * 系统数据统计Mapper接口

13
ruoyi-mall/src/main/java/com/cyl/manager/aws/service/SystemStatisticsService.java
Unescape View File

@ -4,21 +4,17 @@ import java.math.BigDecimal;
import java.time.LocalDate; import java.time.LocalDate;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.time.LocalTime; import java.time.LocalTime;
import java.util.Arrays;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
import java.util.List; import java.util.List;
import java.time.LocalDateTime;
import java.util.Map; import java.util.Map;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.collection.CollectionUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.cyl.manager.oms.domain.entity.Aftersale;
import com.cyl.manager.oms.domain.Aftersale;
import com.cyl.manager.oms.mapper.AftersaleMapper; import com.cyl.manager.oms.mapper.AftersaleMapper;
import com.cyl.manager.oms.mapper.OrderMapper; import com.cyl.manager.oms.mapper.OrderMapper;
import com.cyl.manager.ums.domain.Member; import com.cyl.manager.ums.domain.entity.Member;
import com.cyl.manager.ums.domain.MemberCart;
import com.cyl.manager.ums.mapper.MemberCartMapper; import com.cyl.manager.ums.mapper.MemberCartMapper;
import com.cyl.manager.ums.mapper.MemberLogininforMapper; import com.cyl.manager.ums.mapper.MemberLogininforMapper;
import com.cyl.manager.ums.mapper.MemberMapper; import com.cyl.manager.ums.mapper.MemberMapper;
@ -27,11 +23,10 @@ import com.github.pagehelper.PageHelper;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.PageImpl; import org.springframework.data.domain.PageImpl;
import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Pageable;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.cyl.manager.aws.mapper.SystemStatisticsMapper; import com.cyl.manager.aws.mapper.SystemStatisticsMapper;
import com.cyl.manager.aws.domain.SystemStatistics; import com.cyl.manager.aws.domain.entity.SystemStatistics;
import com.cyl.manager.aws.pojo.query.SystemStatisticsQuery; import com.cyl.manager.aws.domain.query.SystemStatisticsQuery;
/** /**
* 系统数据统计Service业务层处理 * 系统数据统计Service业务层处理

14
ruoyi-mall/src/main/java/com/cyl/manager/oms/controller/AftersaleController.java
Unescape View File

@ -2,11 +2,11 @@ package com.cyl.manager.oms.controller;
import java.util.List; import java.util.List;
import com.cyl.manager.oms.pojo.request.DealWithAftersaleRequest; import com.cyl.manager.oms.domain.form.DealWithAftersaleRequest;
import com.cyl.manager.oms.pojo.request.ManagerAftersaleOrderRequest; import com.cyl.manager.oms.domain.form.ManagerAftersaleOrderRequest;
import com.cyl.manager.oms.pojo.vo.ManagerRefundOrderDetailVO; import com.cyl.manager.oms.domain.vo.ManagerRefundOrderDetailVO;
import com.cyl.manager.oms.pojo.vo.ManagerRefundOrderVO; import com.cyl.manager.oms.domain.vo.ManagerRefundOrderVO;
import com.cyl.manager.oms.pojo.vo.OrderOperateHistoryVO; import com.cyl.manager.oms.domain.vo.OrderOperateHistoryVO;
import com.ruoyi.common.core.domain.model.LoginUser; import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.core.redis.RedisService; import com.ruoyi.common.core.redis.RedisService;
import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.SecurityUtils;
@ -31,8 +31,8 @@ import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.enums.BusinessType;
import com.cyl.manager.oms.convert.AftersaleConvert; import com.cyl.manager.oms.convert.AftersaleConvert;
import com.cyl.manager.oms.domain.Aftersale; import com.cyl.manager.oms.domain.entity.Aftersale;
import com.cyl.manager.oms.pojo.query.AftersaleQuery; import com.cyl.manager.oms.domain.query.AftersaleQuery;
import com.cyl.manager.oms.service.AftersaleService; import com.cyl.manager.oms.service.AftersaleService;
/** /**

6
ruoyi-mall/src/main/java/com/cyl/manager/oms/controller/AftersaleItemController.java
Unescape View File

@ -22,10 +22,10 @@ import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.enums.BusinessType;
import com.cyl.manager.oms.convert.AftersaleItemConvert; import com.cyl.manager.oms.convert.AftersaleItemConvert;
import com.cyl.manager.oms.domain.AftersaleItem; import com.cyl.manager.oms.domain.entity.AftersaleItem;
import com.cyl.manager.oms.pojo.query.AftersaleItemQuery; import com.cyl.manager.oms.domain.query.AftersaleItemQuery;
import com.cyl.manager.oms.service.AftersaleItemService; import com.cyl.manager.oms.service.AftersaleItemService;
import com.cyl.manager.oms.pojo.vo.AftersaleItemVO; import com.cyl.manager.oms.domain.vo.AftersaleItemVO;
import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.utils.poi.ExcelUtil;
/** /**
* 订单售后Controller * 订单售后Controller

14
ruoyi-mall/src/main/java/com/cyl/manager/oms/controller/OrderController.java
Unescape View File

@ -1,13 +1,13 @@
package com.cyl.manager.oms.controller; package com.cyl.manager.oms.controller;
import com.cyl.manager.oms.convert.OrderConvert; import com.cyl.manager.oms.convert.OrderConvert;
import com.cyl.manager.oms.domain.Order; import com.cyl.manager.oms.domain.entity.Order;
import com.cyl.manager.oms.pojo.query.OrderQuery; import com.cyl.manager.oms.domain.query.OrderQuery;
import com.cyl.manager.oms.pojo.request.DeliverProductRequest; import com.cyl.manager.oms.domain.form.DeliverProductRequest;
import com.cyl.manager.oms.pojo.request.ManagerOrderQueryRequest; import com.cyl.manager.oms.domain.form.ManagerOrderQueryRequest;
import com.cyl.manager.oms.pojo.vo.ManagerOrderDetailVO; import com.cyl.manager.oms.domain.vo.ManagerOrderDetailVO;
import com.cyl.manager.oms.pojo.vo.ManagerOrderVO; import com.cyl.manager.oms.domain.vo.ManagerOrderVO;
import com.cyl.manager.oms.pojo.vo.OrderOperateHistoryVO; import com.cyl.manager.oms.domain.vo.OrderOperateHistoryVO;
import com.cyl.manager.oms.service.OrderService; import com.cyl.manager.oms.service.OrderService;
import com.ruoyi.common.annotation.Log; import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.controller.BaseController;

6
ruoyi-mall/src/main/java/com/cyl/manager/oms/controller/OrderDeliveryHistoryController.java
Unescape View File

@ -22,10 +22,10 @@ import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.enums.BusinessType;
import com.cyl.manager.oms.convert.OrderDeliveryHistoryConvert; import com.cyl.manager.oms.convert.OrderDeliveryHistoryConvert;
import com.cyl.manager.oms.domain.OrderDeliveryHistory; import com.cyl.manager.oms.domain.entity.OrderDeliveryHistory;
import com.cyl.manager.oms.pojo.query.OrderDeliveryHistoryQuery; import com.cyl.manager.oms.domain.query.OrderDeliveryHistoryQuery;
import com.cyl.manager.oms.service.OrderDeliveryHistoryService; import com.cyl.manager.oms.service.OrderDeliveryHistoryService;
import com.cyl.manager.oms.pojo.vo.OrderDeliveryHistoryVO; import com.cyl.manager.oms.domain.vo.OrderDeliveryHistoryVO;
import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.utils.poi.ExcelUtil;
/** /**
* 订单发货记录Controller * 订单发货记录Controller

6
ruoyi-mall/src/main/java/com/cyl/manager/oms/controller/OrderItemController.java
Unescape View File

@ -22,10 +22,10 @@ import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.enums.BusinessType;
import com.cyl.manager.oms.convert.OrderItemConvert; import com.cyl.manager.oms.convert.OrderItemConvert;
import com.cyl.manager.oms.domain.OrderItem; import com.cyl.manager.oms.domain.entity.OrderItem;
import com.cyl.manager.oms.pojo.query.OrderItemQuery; import com.cyl.manager.oms.domain.query.OrderItemQuery;
import com.cyl.manager.oms.service.OrderItemService; import com.cyl.manager.oms.service.OrderItemService;
import com.cyl.manager.oms.pojo.vo.OrderItemVO; import com.cyl.manager.oms.domain.vo.OrderItemVO;
import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.utils.poi.ExcelUtil;
/** /**
* 订单中所包含的商品Controller * 订单中所包含的商品Controller

6
ruoyi-mall/src/main/java/com/cyl/manager/oms/controller/OrderOperateHistoryController.java
Unescape View File

@ -22,10 +22,10 @@ import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.enums.BusinessType;
import com.cyl.manager.oms.convert.OrderOperateHistoryConvert; import com.cyl.manager.oms.convert.OrderOperateHistoryConvert;
import com.cyl.manager.oms.domain.OrderOperateHistory; import com.cyl.manager.oms.domain.entity.OrderOperateHistory;
import com.cyl.manager.oms.pojo.query.OrderOperateHistoryQuery; import com.cyl.manager.oms.domain.query.OrderOperateHistoryQuery;
import com.cyl.manager.oms.service.OrderOperateHistoryService; import com.cyl.manager.oms.service.OrderOperateHistoryService;
import com.cyl.manager.oms.pojo.vo.OrderOperateHistoryVO; import com.cyl.manager.oms.domain.vo.OrderOperateHistoryVO;
import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.utils.poi.ExcelUtil;
/** /**
* 订单操作历史记录Controller * 订单操作历史记录Controller

6
ruoyi-mall/src/main/java/com/cyl/manager/oms/controller/WechatPaymentHistoryController.java
Unescape View File

@ -2,7 +2,7 @@ package com.cyl.manager.oms.controller;
import java.util.List; import java.util.List;
import com.cyl.manager.oms.domain.WechatPaymentHistory; import com.cyl.manager.oms.domain.entity.WechatPaymentHistory;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.springframework.data.domain.PageImpl; import org.springframework.data.domain.PageImpl;
@ -23,9 +23,9 @@ import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.enums.BusinessType;
import com.cyl.manager.oms.convert.WechatPaymentHistoryConvert; import com.cyl.manager.oms.convert.WechatPaymentHistoryConvert;
import com.cyl.manager.oms.pojo.query.WechatPaymentHistoryQuery; import com.cyl.manager.oms.domain.query.WechatPaymentHistoryQuery;
import com.cyl.manager.oms.service.WechatPaymentHistoryService; import com.cyl.manager.oms.service.WechatPaymentHistoryService;
import com.cyl.manager.oms.pojo.vo.WechatPaymentHistoryVO; import com.cyl.manager.oms.domain.vo.WechatPaymentHistoryVO;
import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.utils.poi.ExcelUtil;
/** /**
* 微信订单表Controller * 微信订单表Controller

4
ruoyi-mall/src/main/java/com/cyl/manager/oms/convert/AftersaleConvert.java
Unescape View File

@ -1,8 +1,8 @@
package com.cyl.manager.oms.convert; package com.cyl.manager.oms.convert;
import org.mapstruct.Mapper; import org.mapstruct.Mapper;
import com.cyl.manager.oms.domain.Aftersale; import com.cyl.manager.oms.domain.entity.Aftersale;
import com.cyl.manager.oms.pojo.vo.AftersaleVO; import com.cyl.manager.oms.domain.vo.AftersaleVO;
import java.util.List; import java.util.List;
/** /**
* 订单售后 DO <=> DTO <=> VO / BO / Query * 订单售后 DO <=> DTO <=> VO / BO / Query

4
ruoyi-mall/src/main/java/com/cyl/manager/oms/convert/AftersaleItemConvert.java
Unescape View File

@ -1,8 +1,8 @@
package com.cyl.manager.oms.convert; package com.cyl.manager.oms.convert;
import org.mapstruct.Mapper; import org.mapstruct.Mapper;
import com.cyl.manager.oms.domain.AftersaleItem; import com.cyl.manager.oms.domain.entity.AftersaleItem;
import com.cyl.manager.oms.pojo.vo.AftersaleItemVO; import com.cyl.manager.oms.domain.vo.AftersaleItemVO;
import java.util.List; import java.util.List;
/** /**
* 订单售后 DO <=> DTO <=> VO / BO / Query * 订单售后 DO <=> DTO <=> VO / BO / Query

4
ruoyi-mall/src/main/java/com/cyl/manager/oms/convert/OrderConvert.java
Unescape View File

@ -1,8 +1,8 @@
package com.cyl.manager.oms.convert; package com.cyl.manager.oms.convert;
import org.mapstruct.Mapper; import org.mapstruct.Mapper;
import com.cyl.manager.oms.domain.Order; import com.cyl.manager.oms.domain.entity.Order;
import com.cyl.manager.oms.pojo.vo.OrderVO; import com.cyl.manager.oms.domain.vo.OrderVO;
import java.util.List; import java.util.List;
/** /**
* 订单表 DO <=> DTO <=> VO / BO / Query * 订单表 DO <=> DTO <=> VO / BO / Query

4
ruoyi-mall/src/main/java/com/cyl/manager/oms/convert/OrderDeliveryHistoryConvert.java
Unescape View File

@ -1,8 +1,8 @@
package com.cyl.manager.oms.convert; package com.cyl.manager.oms.convert;
import org.mapstruct.Mapper; import org.mapstruct.Mapper;
import com.cyl.manager.oms.domain.OrderDeliveryHistory; import com.cyl.manager.oms.domain.entity.OrderDeliveryHistory;
import com.cyl.manager.oms.pojo.vo.OrderDeliveryHistoryVO; import com.cyl.manager.oms.domain.vo.OrderDeliveryHistoryVO;
import java.util.List; import java.util.List;
/** /**
* 订单发货记录 DO <=> DTO <=> VO / BO / Query * 订单发货记录 DO <=> DTO <=> VO / BO / Query

4
ruoyi-mall/src/main/java/com/cyl/manager/oms/convert/OrderItemConvert.java
Unescape View File

@ -1,8 +1,8 @@
package com.cyl.manager.oms.convert; package com.cyl.manager.oms.convert;
import org.mapstruct.Mapper; import org.mapstruct.Mapper;
import com.cyl.manager.oms.domain.OrderItem; import com.cyl.manager.oms.domain.entity.OrderItem;
import com.cyl.manager.oms.pojo.vo.OrderItemVO; import com.cyl.manager.oms.domain.vo.OrderItemVO;
import java.util.List; import java.util.List;
/** /**
* 订单中所包含的商品 DO <=> DTO <=> VO / BO / Query * 订单中所包含的商品 DO <=> DTO <=> VO / BO / Query

4
ruoyi-mall/src/main/java/com/cyl/manager/oms/convert/OrderOperateHistoryConvert.java
Unescape View File

@ -1,8 +1,8 @@
package com.cyl.manager.oms.convert; package com.cyl.manager.oms.convert;
import org.mapstruct.Mapper; import org.mapstruct.Mapper;
import com.cyl.manager.oms.domain.OrderOperateHistory; import com.cyl.manager.oms.domain.entity.OrderOperateHistory;
import com.cyl.manager.oms.pojo.vo.OrderOperateHistoryVO; import com.cyl.manager.oms.domain.vo.OrderOperateHistoryVO;
import java.util.List; import java.util.List;
/** /**
* 订单操作历史记录 DO <=> DTO <=> VO / BO / Query * 订单操作历史记录 DO <=> DTO <=> VO / BO / Query

4
ruoyi-mall/src/main/java/com/cyl/manager/oms/convert/WechatPaymentHistoryConvert.java
Unescape View File

@ -1,8 +1,8 @@
package com.cyl.manager.oms.convert; package com.cyl.manager.oms.convert;
import org.mapstruct.Mapper; import org.mapstruct.Mapper;
import com.cyl.manager.oms.domain.WechatPaymentHistory; import com.cyl.manager.oms.domain.entity.WechatPaymentHistory;
import com.cyl.manager.oms.pojo.vo.WechatPaymentHistoryVO; import com.cyl.manager.oms.domain.vo.WechatPaymentHistoryVO;
import java.util.List; import java.util.List;
/** /**
* 微信订单表 DO <=> DTO <=> VO / BO / Query * 微信订单表 DO <=> DTO <=> VO / BO / Query

2
ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/Aftersale.java → ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/entity/Aftersale.java
Unescape View File

@ -1,4 +1,4 @@
package com.cyl.manager.oms.domain; package com.cyl.manager.oms.domain.entity;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.time.LocalDateTime; import java.time.LocalDateTime;

2
ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/AftersaleItem.java → ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/entity/AftersaleItem.java
Unescape View File

@ -1,4 +1,4 @@
package com.cyl.manager.oms.domain; package com.cyl.manager.oms.domain.entity;
import java.math.BigDecimal; import java.math.BigDecimal;
import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.annotation.Excel;

2
ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/Order.java → ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/entity/Order.java
Unescape View File

@ -1,4 +1,4 @@
package com.cyl.manager.oms.domain; package com.cyl.manager.oms.domain.entity;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;

2
ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/OrderDeliveryHistory.java → ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/entity/OrderDeliveryHistory.java
Unescape View File

@ -1,4 +1,4 @@
package com.cyl.manager.oms.domain; package com.cyl.manager.oms.domain.entity;
import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.annotation.Excel;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;

2
ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/OrderItem.java → ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/entity/OrderItem.java
Unescape View File

@ -1,4 +1,4 @@
package com.cyl.manager.oms.domain; package com.cyl.manager.oms.domain.entity;
import java.math.BigDecimal; import java.math.BigDecimal;

2
ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/OrderOperateHistory.java → ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/entity/OrderOperateHistory.java
Unescape View File

@ -1,4 +1,4 @@
package com.cyl.manager.oms.domain; package com.cyl.manager.oms.domain.entity;
import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.annotation.Excel;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;

2
ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/WechatPaymentHistory.java → ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/entity/WechatPaymentHistory.java
Unescape View File

@ -1,4 +1,4 @@
package com.cyl.manager.oms.domain; package com.cyl.manager.oms.domain.entity;
import java.math.BigDecimal; import java.math.BigDecimal;
import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.annotation.Excel;

2
ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/request/DealWithAftersaleRequest.java → ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/form/DealWithAftersaleRequest.java
Unescape View File

@ -1,4 +1,4 @@
package com.cyl.manager.oms.pojo.request; package com.cyl.manager.oms.domain.form;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;

2
ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/request/DeliverProductRequest.java → ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/form/DeliverProductRequest.java
Unescape View File

@ -1,4 +1,4 @@
package com.cyl.manager.oms.pojo.request; package com.cyl.manager.oms.domain.form;
import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.annotation.Excel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Getter; import lombok.Getter;

3
ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/request/ManagerAftersaleOrderRequest.java → ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/form/ManagerAftersaleOrderRequest.java
Unescape View File

@ -1,4 +1,4 @@
package com.cyl.manager.oms.pojo.request; package com.cyl.manager.oms.domain.form;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
@ -7,7 +7,6 @@ import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat; import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.Date;
@Data @Data

3
ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/request/ManagerOrderQueryRequest.java → ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/form/ManagerOrderQueryRequest.java
Unescape View File

@ -1,4 +1,4 @@
package com.cyl.manager.oms.pojo.request; package com.cyl.manager.oms.domain.form;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
@ -7,7 +7,6 @@ import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat; import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.Date;
@Data @Data
@ApiModel("后台订单查询请求体") @ApiModel("后台订单查询请求体")

2
ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/query/AftersaleItemQuery.java → ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/query/AftersaleItemQuery.java
Unescape View File

@ -1,4 +1,4 @@
package com.cyl.manager.oms.pojo.query; package com.cyl.manager.oms.domain.query;
import java.math.BigDecimal; import java.math.BigDecimal;
import lombok.Data; import lombok.Data;

2
ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/query/AftersaleQuery.java → ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/query/AftersaleQuery.java
Unescape View File

@ -1,4 +1,4 @@
package com.cyl.manager.oms.pojo.query; package com.cyl.manager.oms.domain.query;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.time.LocalDateTime; import java.time.LocalDateTime;

2
ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/query/OrderDeliveryHistoryQuery.java → ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/query/OrderDeliveryHistoryQuery.java
Unescape View File

@ -1,4 +1,4 @@
package com.cyl.manager.oms.pojo.query; package com.cyl.manager.oms.domain.query;
import lombok.Data; import lombok.Data;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;

2
ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/query/OrderItemQuery.java → ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/query/OrderItemQuery.java
Unescape View File

@ -1,4 +1,4 @@
package com.cyl.manager.oms.pojo.query; package com.cyl.manager.oms.domain.query;
import java.math.BigDecimal; import java.math.BigDecimal;
import lombok.Data; import lombok.Data;

2
ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/query/OrderOperateHistoryQuery.java → ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/query/OrderOperateHistoryQuery.java
Unescape View File

@ -1,4 +1,4 @@
package com.cyl.manager.oms.pojo.query; package com.cyl.manager.oms.domain.query;
import lombok.Data; import lombok.Data;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;

Some files were not shown because too many files have changed in this diff Show More

Write Preview
Loading…
Cancel
Save