diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java index 5d54b4f..4807ea0 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java @@ -2,9 +2,9 @@ package com.ruoyi.web.controller.common; import com.alibaba.fastjson.JSON; 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.pojo.dto.AddressDTO; +import com.cyl.manager.ums.domain.dto.AddressDTO; import com.ruoyi.common.config.RuoYiConfig; import com.ruoyi.common.constant.Constants; import com.ruoyi.common.core.domain.AjaxResult; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/core/config/H5MemberInterceptor.java b/ruoyi-admin/src/main/java/com/ruoyi/web/core/config/H5MemberInterceptor.java index 8cbe353..0aa5c46 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/core/config/H5MemberInterceptor.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/core/config/H5MemberInterceptor.java @@ -1,6 +1,6 @@ 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.ruoyi.common.constant.Constants; import com.ruoyi.common.constant.HttpStatus; diff --git a/ruoyi-admin/src/test/java/com/fjp/lc/test/service/ServiceTest.java b/ruoyi-admin/src/test/java/com/fjp/lc/test/service/ServiceTest.java index 6e3e024..fdca43b 100644 --- a/ruoyi-admin/src/test/java/com/fjp/lc/test/service/ServiceTest.java +++ b/ruoyi-admin/src/test/java/com/fjp/lc/test/service/ServiceTest.java @@ -5,7 +5,7 @@ import cn.hutool.core.util.CharsetUtil; import cn.hutool.core.util.IdUtil; import cn.hutool.crypto.SecureUtil; 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.job.OrderJob; import com.cyl.manager.act.service.IntegralHistoryService; diff --git a/ruoyi-admin/src/test/java/com/fjp/lc/test/service/WechatTest.java b/ruoyi-admin/src/test/java/com/fjp/lc/test/service/WechatTest.java index cb462a3..f28a168 100644 --- a/ruoyi-admin/src/test/java/com/fjp/lc/test/service/WechatTest.java +++ b/ruoyi-admin/src/test/java/com/fjp/lc/test/service/WechatTest.java @@ -1,6 +1,6 @@ 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.ruoyi.RuoYiApplication; import org.junit.Test; diff --git a/ruoyi-mall/src/main/java/com/cyl/h5/config/SecurityUtil.java b/ruoyi-mall/src/main/java/com/cyl/h5/config/SecurityUtil.java index aacc66a..6b70540 100644 --- a/ruoyi-mall/src/main/java/com/cyl/h5/config/SecurityUtil.java +++ b/ruoyi-mall/src/main/java/com/cyl/h5/config/SecurityUtil.java @@ -1,6 +1,6 @@ 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.framework.config.LocalDataUtil; import org.springframework.stereotype.Service; diff --git a/ruoyi-mall/src/main/java/com/cyl/h5/controller/CategoryController.java b/ruoyi-mall/src/main/java/com/cyl/h5/controller/CategoryController.java index 36e4a1c..c62acec 100644 --- a/ruoyi-mall/src/main/java/com/cyl/h5/controller/CategoryController.java +++ b/ruoyi-mall/src/main/java/com/cyl/h5/controller/CategoryController.java @@ -1,6 +1,6 @@ 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 org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.ResponseEntity; diff --git a/ruoyi-mall/src/main/java/com/cyl/h5/controller/H5CommonController.java b/ruoyi-mall/src/main/java/com/cyl/h5/controller/H5CommonController.java index 15a0d6f..127e78f 100644 --- a/ruoyi-mall/src/main/java/com/cyl/h5/controller/H5CommonController.java +++ b/ruoyi-mall/src/main/java/com/cyl/h5/controller/H5CommonController.java @@ -2,10 +2,10 @@ package com.cyl.h5.controller; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.cyl.manager.ums.domain.Address; -import com.cyl.manager.ums.domain.Feedback; +import com.cyl.manager.ums.domain.entity.Address; +import com.cyl.manager.ums.domain.entity.Feedback; 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.ruoyi.common.annotation.Log; import com.ruoyi.common.core.domain.AjaxResult; @@ -17,7 +17,6 @@ import io.swagger.annotations.ApiOperation; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.ResponseEntity; -import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; diff --git a/ruoyi-mall/src/main/java/com/cyl/h5/controller/H5MemberAddressController.java b/ruoyi-mall/src/main/java/com/cyl/h5/controller/H5MemberAddressController.java index 1587c28..0ba966b 100644 --- a/ruoyi-mall/src/main/java/com/cyl/h5/controller/H5MemberAddressController.java +++ b/ruoyi-mall/src/main/java/com/cyl/h5/controller/H5MemberAddressController.java @@ -1,8 +1,8 @@ package com.cyl.h5.controller; import com.cyl.h5.service.H5MemberAddressService; -import com.cyl.manager.ums.pojo.dto.MemberAddressDTO; -import com.cyl.manager.ums.pojo.vo.MemberAddressVO; +import com.cyl.manager.ums.domain.form.MemberAddressForm; +import com.cyl.manager.ums.domain.vo.MemberAddressVO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; @@ -27,13 +27,13 @@ public class H5MemberAddressController { } @PostMapping("/create") - public ResponseEntity create(@RequestBody MemberAddressDTO memberAddressDTO){ - return ResponseEntity.ok(h5MemberAddressService.insert(memberAddressDTO)); + public ResponseEntity create(@RequestBody MemberAddressForm memberAddressForm){ + return ResponseEntity.ok(h5MemberAddressService.insert(memberAddressForm)); } @PutMapping("/update") - public ResponseEntity update(@RequestBody MemberAddressDTO memberAddressDTO){ - return ResponseEntity.ok(h5MemberAddressService.update(memberAddressDTO)); + public ResponseEntity update(@RequestBody MemberAddressForm memberAddressForm){ + return ResponseEntity.ok(h5MemberAddressService.update(memberAddressForm)); } @GetMapping("/{id}") diff --git a/ruoyi-mall/src/main/java/com/cyl/h5/controller/H5MemberCartController.java b/ruoyi-mall/src/main/java/com/cyl/h5/controller/H5MemberCartController.java index 6a83d80..0b40187 100644 --- a/ruoyi-mall/src/main/java/com/cyl/h5/controller/H5MemberCartController.java +++ b/ruoyi-mall/src/main/java/com/cyl/h5/controller/H5MemberCartController.java @@ -2,10 +2,10 @@ package com.cyl.h5.controller; import com.cyl.h5.service.H5MemberCartService; import com.cyl.manager.ums.convert.MemberCartConvert; -import com.cyl.manager.ums.domain.Member; -import com.cyl.manager.ums.domain.MemberCart; -import com.cyl.manager.ums.pojo.query.MemberCartQuery; -import com.cyl.manager.ums.pojo.vo.MemberCartVO; +import com.cyl.manager.ums.domain.entity.Member; +import com.cyl.manager.ums.domain.entity.MemberCart; +import com.cyl.manager.ums.domain.query.MemberCartQuery; +import com.cyl.manager.ums.domain.vo.MemberCartVO; import com.ruoyi.common.constant.Constants; import com.ruoyi.framework.config.LocalDataUtil; import org.springframework.beans.factory.annotation.Autowired; diff --git a/ruoyi-mall/src/main/java/com/cyl/h5/controller/H5MemberController.java b/ruoyi-mall/src/main/java/com/cyl/h5/controller/H5MemberController.java index cb4d62f..c23ebae 100644 --- a/ruoyi-mall/src/main/java/com/cyl/h5/controller/H5MemberController.java +++ b/ruoyi-mall/src/main/java/com/cyl/h5/controller/H5MemberController.java @@ -1,13 +1,13 @@ package com.cyl.h5.controller; import com.alibaba.fastjson.JSON; -import com.cyl.h5.pojo.dto.H5LoginDTO; -import com.cyl.h5.pojo.request.RegisterRequest; -import com.cyl.h5.pojo.response.RegisterResponse; -import com.cyl.h5.pojo.response.ValidatePhoneResponse; -import com.cyl.h5.pojo.response.H5LoginResponse; +import com.cyl.h5.domain.vo.H5LoginVO; +import com.cyl.h5.domain.form.RegisterRequest; +import com.cyl.h5.domain.vo.RegisterResponse; +import com.cyl.h5.domain.vo.ValidatePhoneResponse; +import com.cyl.h5.domain.vo.H5LoginResponse; 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.framework.web.service.TokenService; import io.swagger.annotations.ApiOperation; @@ -52,7 +52,7 @@ public class H5MemberController { if (StringUtils.isEmpty(data)) { 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)); } diff --git a/ruoyi-mall/src/main/java/com/cyl/h5/controller/H5OrderController.java b/ruoyi-mall/src/main/java/com/cyl/h5/controller/H5OrderController.java index 68db845..8560a71 100644 --- a/ruoyi-mall/src/main/java/com/cyl/h5/controller/H5OrderController.java +++ b/ruoyi-mall/src/main/java/com/cyl/h5/controller/H5OrderController.java @@ -1,18 +1,18 @@ package com.cyl.h5.controller; import com.alibaba.fastjson.JSONObject; -import com.cyl.h5.pojo.dto.ApplyRefundDTO; -import com.cyl.h5.pojo.dto.OrderCreateDTO; -import com.cyl.h5.pojo.request.CancelOrderRequest; -import com.cyl.h5.pojo.request.OrderPayRequest; -import com.cyl.h5.pojo.response.OrderPayResponse; -import com.cyl.h5.pojo.vo.AftersaleRefundInfoVO; -import com.cyl.h5.pojo.vo.CountOrderVO; -import com.cyl.h5.pojo.vo.H5OrderVO; -import com.cyl.h5.pojo.vo.OrderCalcVO; -import com.cyl.h5.pojo.vo.form.OrderSubmitForm; +import com.cyl.h5.domain.form.ApplyRefundDTO; +import com.cyl.h5.domain.form.OrderCreateForm; +import com.cyl.h5.domain.form.CancelOrderRequest; +import com.cyl.h5.domain.form.OrderPayRequest; +import com.cyl.h5.domain.vo.OrderPayResponse; +import com.cyl.h5.domain.vo.AftersaleRefundInfoVO; +import com.cyl.h5.domain.vo.CountOrderVO; +import com.cyl.h5.domain.vo.H5OrderVO; +import com.cyl.h5.domain.vo.OrderCalcVO; +import com.cyl.h5.domain.form.OrderSubmitForm; 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.core.redis.RedisService; import com.ruoyi.framework.config.LocalDataUtil; @@ -57,8 +57,8 @@ public class H5OrderController { @ApiOperation("下单前校验") @PostMapping("/addOrderCheck") - public ResponseEntity addOrderCheck(@RequestBody OrderCreateDTO orderCreateDTO){ - return ResponseEntity.ok(service.addOrderCheck(orderCreateDTO)); + public ResponseEntity addOrderCheck(@RequestBody OrderCreateForm orderCreateForm){ + return ResponseEntity.ok(service.addOrderCheck(orderCreateForm)); } @ApiOperation("订单列表") diff --git a/ruoyi-mall/src/main/java/com/cyl/h5/controller/H5ProductController.java b/ruoyi-mall/src/main/java/com/cyl/h5/controller/H5ProductController.java index ac302aa..81f2f93 100644 --- a/ruoyi-mall/src/main/java/com/cyl/h5/controller/H5ProductController.java +++ b/ruoyi-mall/src/main/java/com/cyl/h5/controller/H5ProductController.java @@ -1,10 +1,10 @@ package com.cyl.h5.controller; -import com.cyl.h5.pojo.dto.ProductDTO; -import com.cyl.h5.pojo.vo.ProductDetail; +import com.cyl.h5.domain.vo.H5ProductVO; +import com.cyl.h5.domain.vo.ProductDetail; import com.cyl.manager.pms.convert.ProductConvert; -import com.cyl.manager.pms.domain.Product; -import com.cyl.manager.pms.pojo.query.ProductQuery; +import com.cyl.manager.pms.domain.entity.Product; +import com.cyl.manager.pms.domain.query.ProductQuery; import com.cyl.manager.pms.service.ProductService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Page; @@ -24,7 +24,7 @@ public class H5ProductController { private ProductConvert productConvert; @PostMapping("/list") - public ResponseEntity> queryGoodByPage(@RequestBody ProductQuery query, Pageable page) { + public ResponseEntity> queryGoodByPage(@RequestBody ProductQuery query, Pageable page) { List pageRes = productService.selectList(query, page); return ResponseEntity.ok(new PageImpl<>(productConvert.dos2dtos(pageRes), page, ((com.github.pagehelper.Page) pageRes).getTotal())); } diff --git a/ruoyi-mall/src/main/java/com/cyl/h5/controller/HomeController.java b/ruoyi-mall/src/main/java/com/cyl/h5/controller/HomeController.java index b3de72f..d669705 100644 --- a/ruoyi-mall/src/main/java/com/cyl/h5/controller/HomeController.java +++ b/ruoyi-mall/src/main/java/com/cyl/h5/controller/HomeController.java @@ -1,6 +1,6 @@ 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.ruoyi.system.service.ISysConfigService; import org.springframework.beans.factory.annotation.Autowired; diff --git a/ruoyi-mall/src/main/java/com/cyl/h5/controller/PayNotifyController.java b/ruoyi-mall/src/main/java/com/cyl/h5/controller/PayNotifyController.java index 1cfba5d..6389d07 100644 --- a/ruoyi-mall/src/main/java/com/cyl/h5/controller/PayNotifyController.java +++ b/ruoyi-mall/src/main/java/com/cyl/h5/controller/PayNotifyController.java @@ -2,13 +2,10 @@ package com.cyl.h5.controller; import cn.hutool.core.util.StrUtil; 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.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.RSAAutoCertificateConfig; import com.wechat.pay.java.core.notification.NotificationConfig; import com.wechat.pay.java.core.notification.NotificationParser; import com.wechat.pay.java.core.notification.RequestParam; @@ -17,19 +14,14 @@ import io.swagger.annotations.Api; import org.slf4j.Logger; import org.slf4j.LoggerFactory; 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.RequestMapping; import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import java.io.BufferedReader; import java.io.IOException; -import java.nio.charset.StandardCharsets; import java.text.SimpleDateFormat; -import java.util.HashMap; -import java.util.Map; /** * 订单表Controller diff --git a/ruoyi-mall/src/main/java/com/cyl/h5/controller/UserController.java b/ruoyi-mall/src/main/java/com/cyl/h5/controller/UserController.java index 061b231..2de7179 100644 --- a/ruoyi-mall/src/main/java/com/cyl/h5/controller/UserController.java +++ b/ruoyi-mall/src/main/java/com/cyl/h5/controller/UserController.java @@ -1,7 +1,7 @@ package com.cyl.h5.controller; -import com.cyl.manager.ums.domain.MemberAddress; -import com.cyl.manager.ums.pojo.query.MemberAddressQuery; +import com.cyl.manager.ums.domain.entity.MemberAddress; +import com.cyl.manager.ums.domain.query.MemberAddressQuery; import com.cyl.manager.ums.service.MemberAddressService; import com.ruoyi.common.utils.SecurityUtils; import org.springframework.beans.factory.annotation.Autowired; diff --git a/ruoyi-mall/src/main/java/com/cyl/h5/controller/WechatController2.java b/ruoyi-mall/src/main/java/com/cyl/h5/controller/WechatController2.java index b9d9408..2fad7b8 100644 --- a/ruoyi-mall/src/main/java/com/cyl/h5/controller/WechatController2.java +++ b/ruoyi-mall/src/main/java/com/cyl/h5/controller/WechatController2.java @@ -3,7 +3,7 @@ package com.cyl.h5.controller; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; 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.ruoyi.common.core.domain.AjaxResult; import org.springframework.beans.factory.annotation.Autowired; diff --git a/ruoyi-mall/src/main/java/com/cyl/h5/pojo/dto/CategoryDTO.java b/ruoyi-mall/src/main/java/com/cyl/h5/domain/dto/CategoryDTO.java similarity index 60% rename from ruoyi-mall/src/main/java/com/cyl/h5/pojo/dto/CategoryDTO.java rename to ruoyi-mall/src/main/java/com/cyl/h5/domain/dto/CategoryDTO.java index bd8386b..032a49a 100644 --- a/ruoyi-mall/src/main/java/com/cyl/h5/pojo/dto/CategoryDTO.java +++ b/ruoyi-mall/src/main/java/com/cyl/h5/domain/dto/CategoryDTO.java @@ -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 java.util.List; @@ -10,5 +11,5 @@ public class CategoryDTO { private Integer sort; private String name; private String icon; - private List productList; + private List productList; } diff --git a/ruoyi-mall/src/main/java/com/cyl/h5/pojo/dto/OrderProductListDTO.java b/ruoyi-mall/src/main/java/com/cyl/h5/domain/dto/OrderProductListDTO.java similarity index 89% rename from ruoyi-mall/src/main/java/com/cyl/h5/pojo/dto/OrderProductListDTO.java rename to ruoyi-mall/src/main/java/com/cyl/h5/domain/dto/OrderProductListDTO.java index 0f96d07..db71bb8 100644 --- a/ruoyi-mall/src/main/java/com/cyl/h5/pojo/dto/OrderProductListDTO.java +++ b/ruoyi-mall/src/main/java/com/cyl/h5/domain/dto/OrderProductListDTO.java @@ -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.Sku; + import com.cyl.manager.pms.domain.entity.Product; + import com.cyl.manager.pms.domain.entity.Sku; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/ruoyi-mall/src/main/java/com/cyl/h5/pojo/dto/PayNotifyMessageDTO.java b/ruoyi-mall/src/main/java/com/cyl/h5/domain/dto/PayNotifyMessageDTO.java similarity index 96% rename from ruoyi-mall/src/main/java/com/cyl/h5/pojo/dto/PayNotifyMessageDTO.java rename to ruoyi-mall/src/main/java/com/cyl/h5/domain/dto/PayNotifyMessageDTO.java index 061d8b9..5d57038 100644 --- a/ruoyi-mall/src/main/java/com/cyl/h5/pojo/dto/PayNotifyMessageDTO.java +++ b/ruoyi-mall/src/main/java/com/cyl/h5/domain/dto/PayNotifyMessageDTO.java @@ -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 lombok.Data; diff --git a/ruoyi-mall/src/main/java/com/cyl/h5/pojo/dto/ApplyRefundDTO.java b/ruoyi-mall/src/main/java/com/cyl/h5/domain/form/ApplyRefundDTO.java similarity index 96% rename from ruoyi-mall/src/main/java/com/cyl/h5/pojo/dto/ApplyRefundDTO.java rename to ruoyi-mall/src/main/java/com/cyl/h5/domain/form/ApplyRefundDTO.java index 100fc30..e2feaeb 100644 --- a/ruoyi-mall/src/main/java/com/cyl/h5/pojo/dto/ApplyRefundDTO.java +++ b/ruoyi-mall/src/main/java/com/cyl/h5/domain/form/ApplyRefundDTO.java @@ -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.ApiModelProperty; diff --git a/ruoyi-mall/src/main/java/com/cyl/h5/pojo/request/BindOpenIdRequest.java b/ruoyi-mall/src/main/java/com/cyl/h5/domain/form/BindOpenIdRequest.java similarity index 88% rename from ruoyi-mall/src/main/java/com/cyl/h5/pojo/request/BindOpenIdRequest.java rename to ruoyi-mall/src/main/java/com/cyl/h5/domain/form/BindOpenIdRequest.java index 449c71d..2433982 100644 --- a/ruoyi-mall/src/main/java/com/cyl/h5/pojo/request/BindOpenIdRequest.java +++ b/ruoyi-mall/src/main/java/com/cyl/h5/domain/form/BindOpenIdRequest.java @@ -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.ApiModelProperty; diff --git a/ruoyi-mall/src/main/java/com/cyl/h5/pojo/request/CancelOrderRequest.java b/ruoyi-mall/src/main/java/com/cyl/h5/domain/form/CancelOrderRequest.java similarity index 89% rename from ruoyi-mall/src/main/java/com/cyl/h5/pojo/request/CancelOrderRequest.java rename to ruoyi-mall/src/main/java/com/cyl/h5/domain/form/CancelOrderRequest.java index 79a52c4..2bed6b4 100644 --- a/ruoyi-mall/src/main/java/com/cyl/h5/pojo/request/CancelOrderRequest.java +++ b/ruoyi-mall/src/main/java/com/cyl/h5/domain/form/CancelOrderRequest.java @@ -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.ApiModelProperty; diff --git a/ruoyi-mall/src/main/java/com/cyl/h5/pojo/request/H5AccountLoginRequest.java b/ruoyi-mall/src/main/java/com/cyl/h5/domain/form/H5AccountLoginRequest.java similarity index 80% rename from ruoyi-mall/src/main/java/com/cyl/h5/pojo/request/H5AccountLoginRequest.java rename to ruoyi-mall/src/main/java/com/cyl/h5/domain/form/H5AccountLoginRequest.java index e4ed87a..bfc6357 100644 --- a/ruoyi-mall/src/main/java/com/cyl/h5/pojo/request/H5AccountLoginRequest.java +++ b/ruoyi-mall/src/main/java/com/cyl/h5/domain/form/H5AccountLoginRequest.java @@ -1,4 +1,4 @@ -package com.cyl.h5.pojo.request; +package com.cyl.h5.domain.form; import lombok.Data; diff --git a/ruoyi-mall/src/main/java/com/cyl/h5/pojo/request/H5LoginRequest.java b/ruoyi-mall/src/main/java/com/cyl/h5/domain/form/H5LoginRequest.java similarity index 78% rename from ruoyi-mall/src/main/java/com/cyl/h5/pojo/request/H5LoginRequest.java rename to ruoyi-mall/src/main/java/com/cyl/h5/domain/form/H5LoginRequest.java index 557b207..3119407 100644 --- a/ruoyi-mall/src/main/java/com/cyl/h5/pojo/request/H5LoginRequest.java +++ b/ruoyi-mall/src/main/java/com/cyl/h5/domain/form/H5LoginRequest.java @@ -1,4 +1,4 @@ -package com.cyl.h5.pojo.request; +package com.cyl.h5.domain.form; import lombok.Data; diff --git a/ruoyi-mall/src/main/java/com/cyl/h5/pojo/request/H5SmsLoginRequest.java b/ruoyi-mall/src/main/java/com/cyl/h5/domain/form/H5SmsLoginRequest.java similarity index 91% rename from ruoyi-mall/src/main/java/com/cyl/h5/pojo/request/H5SmsLoginRequest.java rename to ruoyi-mall/src/main/java/com/cyl/h5/domain/form/H5SmsLoginRequest.java index 3dd0109..2d603e3 100644 --- a/ruoyi-mall/src/main/java/com/cyl/h5/pojo/request/H5SmsLoginRequest.java +++ b/ruoyi-mall/src/main/java/com/cyl/h5/domain/form/H5SmsLoginRequest.java @@ -1,4 +1,4 @@ -package com.cyl.h5.pojo.request; +package com.cyl.h5.domain.form; import com.cyl.wechat.response.WechatUserAuth; import lombok.Data; diff --git a/ruoyi-mall/src/main/java/com/cyl/h5/pojo/dto/OrderCreateDTO.java b/ruoyi-mall/src/main/java/com/cyl/h5/domain/form/OrderCreateForm.java similarity index 89% rename from ruoyi-mall/src/main/java/com/cyl/h5/pojo/dto/OrderCreateDTO.java rename to ruoyi-mall/src/main/java/com/cyl/h5/domain/form/OrderCreateForm.java index 5b217ce..31a78d8 100644 --- a/ruoyi-mall/src/main/java/com/cyl/h5/pojo/dto/OrderCreateDTO.java +++ b/ruoyi-mall/src/main/java/com/cyl/h5/domain/form/OrderCreateForm.java @@ -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.ApiModelProperty; import lombok.Data; @@ -14,7 +15,7 @@ */ @Data @ApiModel(value = "创建订单请求VO") - public class OrderCreateDTO { + public class OrderCreateForm { @ApiModelProperty(value = "商品购买明细",required = true) private List skuList; diff --git a/ruoyi-mall/src/main/java/com/cyl/h5/pojo/request/OrderPayRequest.java b/ruoyi-mall/src/main/java/com/cyl/h5/domain/form/OrderPayRequest.java similarity index 94% rename from ruoyi-mall/src/main/java/com/cyl/h5/pojo/request/OrderPayRequest.java rename to ruoyi-mall/src/main/java/com/cyl/h5/domain/form/OrderPayRequest.java index 71c4248..612464c 100644 --- a/ruoyi-mall/src/main/java/com/cyl/h5/pojo/request/OrderPayRequest.java +++ b/ruoyi-mall/src/main/java/com/cyl/h5/domain/form/OrderPayRequest.java @@ -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.ApiModelProperty; diff --git a/ruoyi-mall/src/main/java/com/cyl/h5/pojo/vo/form/OrderSubmitForm.java b/ruoyi-mall/src/main/java/com/cyl/h5/domain/form/OrderSubmitForm.java similarity index 87% rename from ruoyi-mall/src/main/java/com/cyl/h5/pojo/vo/form/OrderSubmitForm.java rename to ruoyi-mall/src/main/java/com/cyl/h5/domain/form/OrderSubmitForm.java index 2a7e21f..26e5af3 100644 --- a/ruoyi-mall/src/main/java/com/cyl/h5/pojo/vo/form/OrderSubmitForm.java +++ b/ruoyi-mall/src/main/java/com/cyl/h5/domain/form/OrderSubmitForm.java @@ -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 javax.validation.constraints.NotEmpty; diff --git a/ruoyi-mall/src/main/java/com/cyl/h5/pojo/request/RegisterRequest.java b/ruoyi-mall/src/main/java/com/cyl/h5/domain/form/RegisterRequest.java similarity index 94% rename from ruoyi-mall/src/main/java/com/cyl/h5/pojo/request/RegisterRequest.java rename to ruoyi-mall/src/main/java/com/cyl/h5/domain/form/RegisterRequest.java index 906d034..31ed4f8 100644 --- a/ruoyi-mall/src/main/java/com/cyl/h5/pojo/request/RegisterRequest.java +++ b/ruoyi-mall/src/main/java/com/cyl/h5/domain/form/RegisterRequest.java @@ -1,4 +1,4 @@ -package com.cyl.h5.pojo.request; +package com.cyl.h5.domain.form; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/ruoyi-mall/src/main/java/com/cyl/h5/pojo/vo/form/WechatLoginForm.java b/ruoyi-mall/src/main/java/com/cyl/h5/domain/form/WechatLoginForm.java similarity index 77% rename from ruoyi-mall/src/main/java/com/cyl/h5/pojo/vo/form/WechatLoginForm.java rename to ruoyi-mall/src/main/java/com/cyl/h5/domain/form/WechatLoginForm.java index 531d01c..663acc0 100644 --- a/ruoyi-mall/src/main/java/com/cyl/h5/pojo/vo/form/WechatLoginForm.java +++ b/ruoyi-mall/src/main/java/com/cyl/h5/domain/form/WechatLoginForm.java @@ -1,4 +1,4 @@ -package com.cyl.h5.pojo.vo.form; +package com.cyl.h5.domain.form; import lombok.Data; diff --git a/ruoyi-mall/src/main/java/com/cyl/h5/pojo/vo/query/OrderH5Query.java b/ruoyi-mall/src/main/java/com/cyl/h5/domain/query/OrderH5Query.java similarity index 70% rename from ruoyi-mall/src/main/java/com/cyl/h5/pojo/vo/query/OrderH5Query.java rename to ruoyi-mall/src/main/java/com/cyl/h5/domain/query/OrderH5Query.java index e895503..63abf3f 100644 --- a/ruoyi-mall/src/main/java/com/cyl/h5/pojo/vo/query/OrderH5Query.java +++ b/ruoyi-mall/src/main/java/com/cyl/h5/domain/query/OrderH5Query.java @@ -1,4 +1,4 @@ -package com.cyl.h5.pojo.vo.query; +package com.cyl.h5.domain.query; import lombok.Data; diff --git a/ruoyi-mall/src/main/java/com/cyl/h5/pojo/vo/AftersaleRefundInfoVO.java b/ruoyi-mall/src/main/java/com/cyl/h5/domain/vo/AftersaleRefundInfoVO.java similarity index 92% rename from ruoyi-mall/src/main/java/com/cyl/h5/pojo/vo/AftersaleRefundInfoVO.java rename to ruoyi-mall/src/main/java/com/cyl/h5/domain/vo/AftersaleRefundInfoVO.java index fb55889..8bb388d 100644 --- a/ruoyi-mall/src/main/java/com/cyl/h5/pojo/vo/AftersaleRefundInfoVO.java +++ b/ruoyi-mall/src/main/java/com/cyl/h5/domain/vo/AftersaleRefundInfoVO.java @@ -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.pojo.vo.AftersaleItemVO; -import com.cyl.manager.oms.pojo.vo.OrderItemVO; +import com.cyl.manager.oms.domain.vo.AftersaleItemVO; +import com.cyl.manager.oms.domain.vo.OrderItemVO; import com.fasterxml.jackson.annotation.JsonFormat; import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.core.domain.BaseAudit; diff --git a/ruoyi-mall/src/main/java/com/cyl/h5/pojo/vo/CountOrderVO.java b/ruoyi-mall/src/main/java/com/cyl/h5/domain/vo/CountOrderVO.java similarity index 95% rename from ruoyi-mall/src/main/java/com/cyl/h5/pojo/vo/CountOrderVO.java rename to ruoyi-mall/src/main/java/com/cyl/h5/domain/vo/CountOrderVO.java index 65152f7..fe6c869 100644 --- a/ruoyi-mall/src/main/java/com/cyl/h5/pojo/vo/CountOrderVO.java +++ b/ruoyi-mall/src/main/java/com/cyl/h5/domain/vo/CountOrderVO.java @@ -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.ApiModelProperty; diff --git a/ruoyi-mall/src/main/java/com/cyl/h5/pojo/response/H5LoginResponse.java b/ruoyi-mall/src/main/java/com/cyl/h5/domain/vo/H5LoginResponse.java similarity index 82% rename from ruoyi-mall/src/main/java/com/cyl/h5/pojo/response/H5LoginResponse.java rename to ruoyi-mall/src/main/java/com/cyl/h5/domain/vo/H5LoginResponse.java index 7273f5d..b7f196d 100644 --- a/ruoyi-mall/src/main/java/com/cyl/h5/pojo/response/H5LoginResponse.java +++ b/ruoyi-mall/src/main/java/com/cyl/h5/domain/vo/H5LoginResponse.java @@ -1,4 +1,4 @@ -package com.cyl.h5.pojo.response; +package com.cyl.h5.domain.vo; import lombok.Data; diff --git a/ruoyi-mall/src/main/java/com/cyl/h5/pojo/dto/H5LoginDTO.java b/ruoyi-mall/src/main/java/com/cyl/h5/domain/vo/H5LoginVO.java similarity index 70% rename from ruoyi-mall/src/main/java/com/cyl/h5/pojo/dto/H5LoginDTO.java rename to ruoyi-mall/src/main/java/com/cyl/h5/domain/vo/H5LoginVO.java index 74d4977..8305653 100644 --- a/ruoyi-mall/src/main/java/com/cyl/h5/pojo/dto/H5LoginDTO.java +++ b/ruoyi-mall/src/main/java/com/cyl/h5/domain/vo/H5LoginVO.java @@ -1,9 +1,9 @@ -package com.cyl.h5.pojo.dto; +package com.cyl.h5.domain.vo; import lombok.Data; @Data -public class H5LoginDTO { +public class H5LoginVO { private String data; private String key; diff --git a/ruoyi-mall/src/main/java/com/cyl/h5/pojo/vo/H5OrderVO.java b/ruoyi-mall/src/main/java/com/cyl/h5/domain/vo/H5OrderVO.java similarity index 95% rename from ruoyi-mall/src/main/java/com/cyl/h5/pojo/vo/H5OrderVO.java rename to ruoyi-mall/src/main/java/com/cyl/h5/domain/vo/H5OrderVO.java index 4404321..09cb4a3 100644 --- a/ruoyi-mall/src/main/java/com/cyl/h5/pojo/vo/H5OrderVO.java +++ b/ruoyi-mall/src/main/java/com/cyl/h5/domain/vo/H5OrderVO.java @@ -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 io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/ruoyi-mall/src/main/java/com/cyl/h5/pojo/dto/ProductDTO.java b/ruoyi-mall/src/main/java/com/cyl/h5/domain/vo/H5ProductVO.java similarity index 73% rename from ruoyi-mall/src/main/java/com/cyl/h5/pojo/dto/ProductDTO.java rename to ruoyi-mall/src/main/java/com/cyl/h5/domain/vo/H5ProductVO.java index 5a2e6a9..574f6fc 100644 --- a/ruoyi-mall/src/main/java/com/cyl/h5/pojo/dto/ProductDTO.java +++ b/ruoyi-mall/src/main/java/com/cyl/h5/domain/vo/H5ProductVO.java @@ -1,10 +1,10 @@ -package com.cyl.h5.pojo.dto; +package com.cyl.h5.domain.vo; import lombok.Data; import java.math.BigDecimal; @Data -public class ProductDTO { +public class H5ProductVO { private Long id; private String pic; private String name; diff --git a/ruoyi-mall/src/main/java/com/cyl/h5/pojo/vo/HomeConfigVO.java b/ruoyi-mall/src/main/java/com/cyl/h5/domain/vo/HomeConfigVO.java similarity index 73% rename from ruoyi-mall/src/main/java/com/cyl/h5/pojo/vo/HomeConfigVO.java rename to ruoyi-mall/src/main/java/com/cyl/h5/domain/vo/HomeConfigVO.java index 7d81087..cd86807 100644 --- a/ruoyi-mall/src/main/java/com/cyl/h5/pojo/vo/HomeConfigVO.java +++ b/ruoyi-mall/src/main/java/com/cyl/h5/domain/vo/HomeConfigVO.java @@ -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 java.util.List; diff --git a/ruoyi-mall/src/main/java/com/cyl/h5/pojo/vo/OrderCalcVO.java b/ruoyi-mall/src/main/java/com/cyl/h5/domain/vo/OrderCalcVO.java similarity index 94% rename from ruoyi-mall/src/main/java/com/cyl/h5/pojo/vo/OrderCalcVO.java rename to ruoyi-mall/src/main/java/com/cyl/h5/domain/vo/OrderCalcVO.java index 31cf021..d4e4001 100644 --- a/ruoyi-mall/src/main/java/com/cyl/h5/pojo/vo/OrderCalcVO.java +++ b/ruoyi-mall/src/main/java/com/cyl/h5/domain/vo/OrderCalcVO.java @@ -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.ApiModelProperty; diff --git a/ruoyi-mall/src/main/java/com/cyl/h5/pojo/response/OrderPayResponse.java b/ruoyi-mall/src/main/java/com/cyl/h5/domain/vo/OrderPayResponse.java similarity index 95% rename from ruoyi-mall/src/main/java/com/cyl/h5/pojo/response/OrderPayResponse.java rename to ruoyi-mall/src/main/java/com/cyl/h5/domain/vo/OrderPayResponse.java index d61733e..a02f356 100644 --- a/ruoyi-mall/src/main/java/com/cyl/h5/pojo/response/OrderPayResponse.java +++ b/ruoyi-mall/src/main/java/com/cyl/h5/domain/vo/OrderPayResponse.java @@ -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.ApiModelProperty; diff --git a/ruoyi-mall/src/main/java/com/cyl/h5/domain/vo/ProductDetail.java b/ruoyi-mall/src/main/java/com/cyl/h5/domain/vo/ProductDetail.java new file mode 100644 index 0000000..504958e --- /dev/null +++ b/ruoyi-mall/src/main/java/com/cyl/h5/domain/vo/ProductDetail.java @@ -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 skus; + private Brand brand; +} diff --git a/ruoyi-mall/src/main/java/com/cyl/h5/pojo/response/RegisterResponse.java b/ruoyi-mall/src/main/java/com/cyl/h5/domain/vo/RegisterResponse.java similarity index 75% rename from ruoyi-mall/src/main/java/com/cyl/h5/pojo/response/RegisterResponse.java rename to ruoyi-mall/src/main/java/com/cyl/h5/domain/vo/RegisterResponse.java index 8d6a854..0811f81 100644 --- a/ruoyi-mall/src/main/java/com/cyl/h5/pojo/response/RegisterResponse.java +++ b/ruoyi-mall/src/main/java/com/cyl/h5/domain/vo/RegisterResponse.java @@ -1,4 +1,4 @@ -package com.cyl.h5.pojo.response; +package com.cyl.h5.domain.vo; import lombok.Data; diff --git a/ruoyi-mall/src/main/java/com/cyl/h5/pojo/vo/SkuViewDTO.java b/ruoyi-mall/src/main/java/com/cyl/h5/domain/vo/SkuViewDTO.java similarity index 95% rename from ruoyi-mall/src/main/java/com/cyl/h5/pojo/vo/SkuViewDTO.java rename to ruoyi-mall/src/main/java/com/cyl/h5/domain/vo/SkuViewDTO.java index 4466ead..b6456d2 100644 --- a/ruoyi-mall/src/main/java/com/cyl/h5/pojo/vo/SkuViewDTO.java +++ b/ruoyi-mall/src/main/java/com/cyl/h5/domain/vo/SkuViewDTO.java @@ -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.ApiModelProperty; diff --git a/ruoyi-mall/src/main/java/com/cyl/h5/pojo/response/ValidatePhoneResponse.java b/ruoyi-mall/src/main/java/com/cyl/h5/domain/vo/ValidatePhoneResponse.java similarity index 83% rename from ruoyi-mall/src/main/java/com/cyl/h5/pojo/response/ValidatePhoneResponse.java rename to ruoyi-mall/src/main/java/com/cyl/h5/domain/vo/ValidatePhoneResponse.java index 523de06..375f1ce 100644 --- a/ruoyi-mall/src/main/java/com/cyl/h5/pojo/response/ValidatePhoneResponse.java +++ b/ruoyi-mall/src/main/java/com/cyl/h5/domain/vo/ValidatePhoneResponse.java @@ -1,4 +1,4 @@ -package com.cyl.h5.pojo.response; +package com.cyl.h5.domain.vo; import lombok.Data; diff --git a/ruoyi-mall/src/main/java/com/cyl/h5/pojo/dto/LoginDTO.java b/ruoyi-mall/src/main/java/com/cyl/h5/pojo/dto/LoginDTO.java deleted file mode 100644 index 9778b48..0000000 --- a/ruoyi-mall/src/main/java/com/cyl/h5/pojo/dto/LoginDTO.java +++ /dev/null @@ -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; -} diff --git a/ruoyi-mall/src/main/java/com/cyl/h5/pojo/dto/MicroMallOrderSyncMsg.java b/ruoyi-mall/src/main/java/com/cyl/h5/pojo/dto/MicroMallOrderSyncMsg.java deleted file mode 100644 index 3afd7e2..0000000 --- a/ruoyi-mall/src/main/java/com/cyl/h5/pojo/dto/MicroMallOrderSyncMsg.java +++ /dev/null @@ -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; -} diff --git a/ruoyi-mall/src/main/java/com/cyl/h5/pojo/vo/ProductDetail.java b/ruoyi-mall/src/main/java/com/cyl/h5/pojo/vo/ProductDetail.java deleted file mode 100644 index 26314cf..0000000 --- a/ruoyi-mall/src/main/java/com/cyl/h5/pojo/vo/ProductDetail.java +++ /dev/null @@ -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 skus; - private Brand brand; -} diff --git a/ruoyi-mall/src/main/java/com/cyl/h5/service/H5MemberAddressService.java b/ruoyi-mall/src/main/java/com/cyl/h5/service/H5MemberAddressService.java index 6172678..7b6e6f2 100644 --- a/ruoyi-mall/src/main/java/com/cyl/h5/service/H5MemberAddressService.java +++ b/ruoyi-mall/src/main/java/com/cyl/h5/service/H5MemberAddressService.java @@ -1,11 +1,11 @@ package com.cyl.h5.service; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.cyl.manager.ums.domain.Member; -import com.cyl.manager.ums.domain.MemberAddress; +import com.cyl.manager.ums.domain.entity.Member; +import com.cyl.manager.ums.domain.entity.MemberAddress; import com.cyl.manager.ums.mapper.MemberAddressMapper; -import com.cyl.manager.ums.pojo.dto.MemberAddressDTO; -import com.cyl.manager.ums.pojo.vo.MemberAddressVO; +import com.cyl.manager.ums.domain.form.MemberAddressForm; +import com.cyl.manager.ums.domain.vo.MemberAddressVO; import com.ruoyi.common.constant.Constants; import com.ruoyi.common.utils.AesCryptoUtils; import com.ruoyi.common.utils.PhoneUtils; @@ -67,19 +67,19 @@ public class H5MemberAddressService { /** * 新增会员收货地址 * - * @param memberAddressDTO 会员收货地址 + * @param memberAddressForm 会员收货地址 * @return 结果 */ - public int insert(MemberAddressDTO memberAddressDTO) { + public int insert(MemberAddressForm memberAddressForm) { Member member = (Member) LocalDataUtil.getVar(Constants.MEMBER_INFO); - if (memberAddressDTO.getIsDefault() == 1) { + if (memberAddressForm.getIsDefault() == 1) { //将别的设置为0 memberAddressMapper.updateDefault(0,member.getId()); } MemberAddress memberAddress = new MemberAddress(); - BeanUtils.copyProperties(memberAddressDTO, memberAddress); - memberAddress.setPhoneHidden(PhoneUtils.hidePhone(memberAddressDTO.getPhone())); - memberAddress.setPhoneEncrypted(AesCryptoUtils.encrypt(aesKey, memberAddressDTO.getPhone())); + BeanUtils.copyProperties(memberAddressForm, memberAddress); + memberAddress.setPhoneHidden(PhoneUtils.hidePhone(memberAddressForm.getPhone())); + memberAddress.setPhoneEncrypted(AesCryptoUtils.encrypt(aesKey, memberAddressForm.getPhone())); memberAddress.setMemberId(member.getId()); memberAddress.setCreateTime(LocalDateTime.now()); return memberAddressMapper.insert(memberAddress); @@ -88,20 +88,20 @@ public class H5MemberAddressService { /** * 修改会员收货地址 * - * @param memberAddressDTO 会员收货地址 + * @param memberAddressForm 会员收货地址 * @return 结果 */ - public int update(MemberAddressDTO memberAddressDTO) { + public int update(MemberAddressForm memberAddressForm) { Member member = (Member) LocalDataUtil.getVar(Constants.MEMBER_INFO); - if (memberAddressDTO.getIsDefault() == 1) { + if (memberAddressForm.getIsDefault() == 1) { //将别的设置为0 memberAddressMapper.updateDefault(0,member.getId()); } MemberAddress memberAddress = new MemberAddress(); - BeanUtils.copyProperties(memberAddressDTO, memberAddress); - memberAddress.setPhoneHidden(PhoneUtils.hidePhone(memberAddressDTO.getPhone())); - memberAddress.setPhoneEncrypted(AesCryptoUtils.encrypt(aesKey, memberAddressDTO.getPhone())); + BeanUtils.copyProperties(memberAddressForm, memberAddress); + memberAddress.setPhoneHidden(PhoneUtils.hidePhone(memberAddressForm.getPhone())); + memberAddress.setPhoneEncrypted(AesCryptoUtils.encrypt(aesKey, memberAddressForm.getPhone())); memberAddress.setUpdateTime(LocalDateTime.now()); memberAddress.setUpdateBy(member.getId()); return memberAddressMapper.updateById(memberAddress); diff --git a/ruoyi-mall/src/main/java/com/cyl/h5/service/H5MemberCartService.java b/ruoyi-mall/src/main/java/com/cyl/h5/service/H5MemberCartService.java index 9290b73..d6b4b8b 100644 --- a/ruoyi-mall/src/main/java/com/cyl/h5/service/H5MemberCartService.java +++ b/ruoyi-mall/src/main/java/com/cyl/h5/service/H5MemberCartService.java @@ -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.QueryWrapper; 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.SkuMapper; import com.cyl.manager.ums.convert.MemberCartConvert; -import com.cyl.manager.ums.domain.Member; -import com.cyl.manager.ums.domain.MemberCart; +import com.cyl.manager.ums.domain.entity.Member; +import com.cyl.manager.ums.domain.entity.MemberCart; import com.cyl.manager.ums.mapper.MemberCartMapper; -import com.cyl.manager.ums.pojo.query.MemberCartQuery; -import com.cyl.manager.ums.pojo.vo.MemberCartVO; -import com.cyl.manager.ums.pojo.vo.form.UpdateMemberCartForm; +import com.cyl.manager.ums.domain.query.MemberCartQuery; +import com.cyl.manager.ums.domain.vo.MemberCartVO; +import com.cyl.manager.ums.domain.vo.form.UpdateMemberCartForm; import com.github.pagehelper.PageHelper; import com.ruoyi.common.constant.Constants; import com.ruoyi.common.exception.base.BaseException; diff --git a/ruoyi-mall/src/main/java/com/cyl/h5/service/H5MemberService.java b/ruoyi-mall/src/main/java/com/cyl/h5/service/H5MemberService.java index 5a8eafb..c7839ed 100644 --- a/ruoyi-mall/src/main/java/com/cyl/h5/service/H5MemberService.java +++ b/ruoyi-mall/src/main/java/com/cyl/h5/service/H5MemberService.java @@ -1,27 +1,26 @@ package com.cyl.h5.service; -import cn.hutool.core.util.StrUtil; import cn.hutool.json.JSONUtil; import com.alibaba.fastjson.JSON; 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.pojo.dto.H5LoginDTO; -import com.cyl.h5.pojo.request.BindOpenIdRequest; -import com.cyl.h5.pojo.request.H5AccountLoginRequest; -import com.cyl.h5.pojo.request.H5SmsLoginRequest; -import com.cyl.h5.pojo.request.RegisterRequest; -import com.cyl.h5.pojo.response.RegisterResponse; -import com.cyl.h5.pojo.response.ValidatePhoneResponse; -import com.cyl.h5.pojo.response.H5LoginResponse; -import com.cyl.manager.ums.domain.Member; -import com.cyl.manager.ums.domain.MemberLogininfor; -import com.cyl.manager.ums.domain.MemberWechat; +import com.cyl.h5.domain.vo.H5LoginVO; +import com.cyl.h5.domain.form.BindOpenIdRequest; +import com.cyl.h5.domain.form.H5AccountLoginRequest; +import com.cyl.h5.domain.form.H5SmsLoginRequest; +import com.cyl.h5.domain.form.RegisterRequest; +import com.cyl.h5.domain.vo.RegisterResponse; +import com.cyl.h5.domain.vo.ValidatePhoneResponse; +import com.cyl.h5.domain.vo.H5LoginResponse; +import com.cyl.manager.ums.domain.entity.Member; +import com.cyl.manager.ums.domain.entity.MemberLogininfor; +import com.cyl.manager.ums.domain.entity.MemberWechat; import com.cyl.manager.ums.mapper.MemberLogininforMapper; import com.cyl.manager.ums.mapper.MemberMapper; 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.wechat.WechatAuthService; import com.cyl.wechat.response.WechatUserAuth; @@ -342,7 +341,7 @@ public class H5MemberService { memberLogininforMapper.insert(memberLogininfor); } - public H5LoginResponse wechatLogin(H5LoginDTO params) throws Exception { + public H5LoginResponse wechatLogin(H5LoginVO params) throws Exception { String openId = params.getOpenId(); String sessionKey = params.getSessionKey(); //解密手机号 diff --git a/ruoyi-mall/src/main/java/com/cyl/h5/service/H5OrderService.java b/ruoyi-mall/src/main/java/com/cyl/h5/service/H5OrderService.java index 85a7d47..391a593 100644 --- a/ruoyi-mall/src/main/java/com/cyl/h5/service/H5OrderService.java +++ b/ruoyi-mall/src/main/java/com/cyl/h5/service/H5OrderService.java @@ -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.toolkit.Wrappers; import com.cyl.h5.config.SecurityUtil; -import com.cyl.h5.pojo.dto.ApplyRefundDTO; -import com.cyl.h5.pojo.dto.OrderCreateDTO; -import com.cyl.h5.pojo.dto.OrderProductListDTO; -import com.cyl.h5.pojo.dto.PayNotifyMessageDTO; -import com.cyl.h5.pojo.request.CancelOrderRequest; -import com.cyl.h5.pojo.request.OrderPayRequest; -import com.cyl.h5.pojo.response.OrderPayResponse; -import com.cyl.h5.pojo.vo.*; -import com.cyl.h5.pojo.vo.form.OrderSubmitForm; +import com.cyl.h5.domain.form.ApplyRefundDTO; +import com.cyl.h5.domain.form.OrderCreateForm; +import com.cyl.h5.domain.dto.OrderProductListDTO; +import com.cyl.h5.domain.dto.PayNotifyMessageDTO; +import com.cyl.h5.domain.form.CancelOrderRequest; +import com.cyl.h5.domain.form.OrderPayRequest; +import com.cyl.h5.domain.vo.OrderPayResponse; +import com.cyl.h5.domain.vo.*; +import com.cyl.h5.domain.form.OrderSubmitForm; import com.cyl.manager.act.service.IntegralHistoryService; import com.cyl.manager.oms.convert.AftersaleItemConvert; import com.cyl.manager.oms.convert.OrderItemConvert; -import com.cyl.manager.oms.domain.*; 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.OrderOperateHistoryService; -import com.cyl.manager.pms.domain.Product; -import com.cyl.manager.pms.domain.Sku; +import com.cyl.manager.pms.domain.entity.Product; +import com.cyl.manager.pms.domain.entity.Sku; import com.cyl.manager.pms.mapper.ProductMapper; import com.cyl.manager.pms.mapper.SkuMapper; -import com.cyl.manager.ums.domain.Member; -import com.cyl.manager.ums.domain.MemberAddress; -import com.cyl.manager.ums.domain.MemberCart; -import com.cyl.manager.ums.domain.MemberWechat; +import com.cyl.manager.ums.domain.entity.Member; +import com.cyl.manager.ums.domain.entity.MemberAddress; +import com.cyl.manager.ums.domain.entity.MemberCart; +import com.cyl.manager.ums.domain.entity.MemberWechat; import com.cyl.manager.ums.mapper.MemberAddressMapper; import com.cyl.manager.ums.mapper.MemberCartMapper; import com.cyl.manager.ums.mapper.MemberWechatMapper; @@ -244,10 +244,10 @@ public class H5OrderService { return payId; } - public OrderCalcVO addOrderCheck(OrderCreateDTO orderCreateDTO) { + public OrderCalcVO addOrderCheck(OrderCreateForm orderCreateForm) { OrderCalcVO res = new OrderCalcVO(); List skuList = new ArrayList<>(); - List list = orderCreateDTO.getSkuList(); + List list = orderCreateForm.getSkuList(); if (CollectionUtil.isEmpty(list)){ throw new RuntimeException("商品SKU信息不能为空"); } diff --git a/ruoyi-mall/src/main/java/com/cyl/job/OrderJob.java b/ruoyi-mall/src/main/java/com/cyl/job/OrderJob.java index 45a08bc..9e59e7b 100644 --- a/ruoyi-mall/src/main/java/com/cyl/job/OrderJob.java +++ b/ruoyi-mall/src/main/java/com/cyl/job/OrderJob.java @@ -2,9 +2,9 @@ package com.cyl.job; import cn.hutool.core.date.LocalDateTimeUtil; 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.manager.oms.domain.Order; +import com.cyl.manager.oms.domain.entity.Order; import com.cyl.manager.oms.mapper.OrderMapper; import com.ruoyi.common.constant.Constants; import lombok.extern.slf4j.Slf4j; diff --git a/ruoyi-mall/src/main/java/com/cyl/job/StatisticsJob.java b/ruoyi-mall/src/main/java/com/cyl/job/StatisticsJob.java index 06f6cde..7a7cf8c 100644 --- a/ruoyi-mall/src/main/java/com/cyl/job/StatisticsJob.java +++ b/ruoyi-mall/src/main/java/com/cyl/job/StatisticsJob.java @@ -1,6 +1,6 @@ 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.service.SystemStatisticsService; import lombok.extern.slf4j.Slf4j; diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/act/controller/H5IntegralHistoryController.java b/ruoyi-mall/src/main/java/com/cyl/manager/act/controller/H5IntegralHistoryController.java index cd4d139..39980d5 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/act/controller/H5IntegralHistoryController.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/act/controller/H5IntegralHistoryController.java @@ -1,9 +1,9 @@ package com.cyl.manager.act.controller; import com.cyl.h5.config.SecurityUtil; -import com.cyl.manager.act.domain.IntegralHistory; -import com.cyl.manager.act.pojo.query.IntegralHistoryQuery; -import com.cyl.manager.act.pojo.vo.IntegralStatVO; +import com.cyl.manager.act.domain.entity.IntegralHistory; +import com.cyl.manager.act.domain.query.IntegralHistoryQuery; +import com.cyl.manager.act.domain.vo.IntegralStatVO; import com.cyl.manager.act.service.IntegralHistoryService; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.controller.BaseController; diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/act/controller/IntegralHistoryController.java b/ruoyi-mall/src/main/java/com/cyl/manager/act/controller/IntegralHistoryController.java index 0d4c5b6..80e17ea 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/act/controller/IntegralHistoryController.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/act/controller/IntegralHistoryController.java @@ -1,32 +1,25 @@ 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.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.Pageable; -import org.springframework.data.domain.Page; import org.springframework.http.ResponseEntity; import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.enums.BusinessType; -import com.cyl.manager.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; +import org.springframework.web.bind.annotation.*; + +import java.util.List; /** * 积分流水表Controller * diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/act/convert/IntegralHistoryConvert.java b/ruoyi-mall/src/main/java/com/cyl/manager/act/convert/IntegralHistoryConvert.java index 4b60765..9428a4a 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/act/convert/IntegralHistoryConvert.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/act/convert/IntegralHistoryConvert.java @@ -1,8 +1,8 @@ package com.cyl.manager.act.convert; import org.mapstruct.Mapper; -import com.cyl.manager.act.domain.IntegralHistory; -import com.cyl.manager.act.pojo.vo.IntegralHistoryVO; +import com.cyl.manager.act.domain.entity.IntegralHistory; +import com.cyl.manager.act.domain.vo.IntegralHistoryVO; import java.util.List; /** * 积分流水表 DO <=> DTO <=> VO / BO / Query diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/act/domain/IntegralHistory.java b/ruoyi-mall/src/main/java/com/cyl/manager/act/domain/entity/IntegralHistory.java similarity index 97% rename from ruoyi-mall/src/main/java/com/cyl/manager/act/domain/IntegralHistory.java rename to ruoyi-mall/src/main/java/com/cyl/manager/act/domain/entity/IntegralHistory.java index 6c567c5..eed4c88 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/act/domain/IntegralHistory.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/act/domain/entity/IntegralHistory.java @@ -1,4 +1,4 @@ -package com.cyl.manager.act.domain; +package com.cyl.manager.act.domain.entity; import java.math.BigDecimal; import java.time.LocalDateTime; diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/act/pojo/query/IntegralHistoryQuery.java b/ruoyi-mall/src/main/java/com/cyl/manager/act/domain/query/IntegralHistoryQuery.java similarity index 92% rename from ruoyi-mall/src/main/java/com/cyl/manager/act/pojo/query/IntegralHistoryQuery.java rename to ruoyi-mall/src/main/java/com/cyl/manager/act/domain/query/IntegralHistoryQuery.java index 78a4302..2f0b33e 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/act/pojo/query/IntegralHistoryQuery.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/act/domain/query/IntegralHistoryQuery.java @@ -1,4 +1,4 @@ -package com.cyl.manager.act.pojo.query; +package com.cyl.manager.act.domain.query; import java.math.BigDecimal; import java.time.LocalDateTime; @@ -8,8 +8,6 @@ import lombok.Data; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import javax.validation.constraints.NotBlank; - /** * 积分流水表 查询 对象 * diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/act/pojo/vo/IntegralHistoryVO.java b/ruoyi-mall/src/main/java/com/cyl/manager/act/domain/vo/IntegralHistoryVO.java similarity index 91% rename from ruoyi-mall/src/main/java/com/cyl/manager/act/pojo/vo/IntegralHistoryVO.java rename to ruoyi-mall/src/main/java/com/cyl/manager/act/domain/vo/IntegralHistoryVO.java index e64b725..4f484fe 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/act/pojo/vo/IntegralHistoryVO.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/act/domain/vo/IntegralHistoryVO.java @@ -1,9 +1,8 @@ -package com.cyl.manager.act.pojo.vo; +package com.cyl.manager.act.domain.vo; import java.math.BigDecimal; import java.time.LocalDateTime; import com.ruoyi.common.annotation.Excel; -import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; /** * 积分流水表 数据视图对象 diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/act/pojo/vo/IntegralRule.java b/ruoyi-mall/src/main/java/com/cyl/manager/act/domain/vo/IntegralRule.java similarity index 88% rename from ruoyi-mall/src/main/java/com/cyl/manager/act/pojo/vo/IntegralRule.java rename to ruoyi-mall/src/main/java/com/cyl/manager/act/domain/vo/IntegralRule.java index 35c9fd2..67c1d3c 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/act/pojo/vo/IntegralRule.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/act/domain/vo/IntegralRule.java @@ -1,4 +1,4 @@ -package com.cyl.manager.act.pojo.vo; +package com.cyl.manager.act.domain.vo; import lombok.Data; diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/act/pojo/vo/IntegralStatVO.java b/ruoyi-mall/src/main/java/com/cyl/manager/act/domain/vo/IntegralStatVO.java similarity index 86% rename from ruoyi-mall/src/main/java/com/cyl/manager/act/pojo/vo/IntegralStatVO.java rename to ruoyi-mall/src/main/java/com/cyl/manager/act/domain/vo/IntegralStatVO.java index 0b1ba93..89126bf 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/act/pojo/vo/IntegralStatVO.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/act/domain/vo/IntegralStatVO.java @@ -1,4 +1,4 @@ -package com.cyl.manager.act.pojo.vo; +package com.cyl.manager.act.domain.vo; import lombok.Data; diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/act/mapper/IntegralHistoryMapper.java b/ruoyi-mall/src/main/java/com/cyl/manager/act/mapper/IntegralHistoryMapper.java index c29c037..d36251e 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/act/mapper/IntegralHistoryMapper.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/act/mapper/IntegralHistoryMapper.java @@ -3,9 +3,8 @@ package com.cyl.manager.act.mapper; import java.time.LocalDateTime; import java.util.List; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.cyl.manager.act.pojo.vo.IntegralStatVO; -import org.apache.ibatis.annotations.Param; -import com.cyl.manager.act.domain.IntegralHistory; +import com.cyl.manager.act.domain.vo.IntegralStatVO; +import com.cyl.manager.act.domain.entity.IntegralHistory; /** * 积分流水表Mapper接口 diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/act/service/IntegralHistoryService.java b/ruoyi-mall/src/main/java/com/cyl/manager/act/service/IntegralHistoryService.java index 9691f3b..be9e778 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/act/service/IntegralHistoryService.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/act/service/IntegralHistoryService.java @@ -3,31 +3,26 @@ package com.cyl.manager.act.service; import java.math.BigDecimal; import java.math.RoundingMode; import java.time.LocalDateTime; -import java.util.Arrays; import java.util.List; -import java.time.LocalDateTime; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.cyl.h5.config.SecurityUtil; -import com.cyl.manager.act.pojo.vo.IntegralRule; -import com.cyl.manager.act.pojo.vo.IntegralStatVO; -import com.cyl.manager.ums.domain.Member; -import com.cyl.manager.ums.domain.MemberAccount; +import com.cyl.manager.act.domain.vo.IntegralRule; +import com.cyl.manager.act.domain.vo.IntegralStatVO; +import com.cyl.manager.ums.domain.entity.MemberAccount; import com.cyl.manager.ums.mapper.MemberAccountMapper; import com.github.pagehelper.PageHelper; import com.ruoyi.common.constant.Constants; -import com.ruoyi.framework.config.LocalDataUtil; import com.ruoyi.system.service.ISysConfigService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Pageable; import org.apache.commons.lang3.StringUtils; -import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Service; import com.cyl.manager.act.mapper.IntegralHistoryMapper; -import com.cyl.manager.act.domain.IntegralHistory; -import com.cyl.manager.act.pojo.query.IntegralHistoryQuery; +import com.cyl.manager.act.domain.entity.IntegralHistory; +import com.cyl.manager.act.domain.query.IntegralHistoryQuery; import org.springframework.transaction.annotation.Transactional; /** diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/aws/controller/SystemStatisticsController.java b/ruoyi-mall/src/main/java/com/cyl/manager/aws/controller/SystemStatisticsController.java index 72f0bb5..d2374b8 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/aws/controller/SystemStatisticsController.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/aws/controller/SystemStatisticsController.java @@ -1,10 +1,7 @@ package com.cyl.manager.aws.controller; -import java.util.List; - import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import org.springframework.data.domain.PageImpl; import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Page; 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.enums.BusinessType; import com.cyl.manager.aws.convert.SystemStatisticsConvert; -import com.cyl.manager.aws.domain.SystemStatistics; -import com.cyl.manager.aws.pojo.query.SystemStatisticsQuery; +import com.cyl.manager.aws.domain.entity.SystemStatistics; +import com.cyl.manager.aws.domain.query.SystemStatisticsQuery; import com.cyl.manager.aws.service.SystemStatisticsService; -import com.cyl.manager.aws.pojo.vo.SystemStatisticsVO; -import com.ruoyi.common.utils.poi.ExcelUtil; + /** * 系统数据统计Controller * diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/aws/convert/SystemStatisticsConvert.java b/ruoyi-mall/src/main/java/com/cyl/manager/aws/convert/SystemStatisticsConvert.java index 7bb27ec..b4e6cc6 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/aws/convert/SystemStatisticsConvert.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/aws/convert/SystemStatisticsConvert.java @@ -1,8 +1,8 @@ package com.cyl.manager.aws.convert; import org.mapstruct.Mapper; -import com.cyl.manager.aws.domain.SystemStatistics; -import com.cyl.manager.aws.pojo.vo.SystemStatisticsVO; +import com.cyl.manager.aws.domain.entity.SystemStatistics; +import com.cyl.manager.aws.domain.vo.SystemStatisticsVO; import java.util.List; /** * 系统数据统计 DO <=> DTO <=> VO / BO / Query diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/aws/domain/SystemStatistics.java b/ruoyi-mall/src/main/java/com/cyl/manager/aws/domain/entity/SystemStatistics.java similarity index 97% rename from ruoyi-mall/src/main/java/com/cyl/manager/aws/domain/SystemStatistics.java rename to ruoyi-mall/src/main/java/com/cyl/manager/aws/domain/entity/SystemStatistics.java index c0a85df..875a6cc 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/aws/domain/SystemStatistics.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/aws/domain/entity/SystemStatistics.java @@ -1,4 +1,4 @@ -package com.cyl.manager.aws.domain; +package com.cyl.manager.aws.domain.entity; import java.math.BigDecimal; import java.time.LocalDateTime; diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/aws/pojo/query/SystemStatisticsQuery.java b/ruoyi-mall/src/main/java/com/cyl/manager/aws/domain/query/SystemStatisticsQuery.java similarity index 97% rename from ruoyi-mall/src/main/java/com/cyl/manager/aws/pojo/query/SystemStatisticsQuery.java rename to ruoyi-mall/src/main/java/com/cyl/manager/aws/domain/query/SystemStatisticsQuery.java index 357d8ac..3288d1e 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/aws/pojo/query/SystemStatisticsQuery.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/aws/domain/query/SystemStatisticsQuery.java @@ -1,4 +1,4 @@ -package com.cyl.manager.aws.pojo.query; +package com.cyl.manager.aws.domain.query; import java.math.BigDecimal; import java.time.LocalDateTime; diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/aws/pojo/vo/SystemStatisticsVO.java b/ruoyi-mall/src/main/java/com/cyl/manager/aws/domain/vo/SystemStatisticsVO.java similarity index 97% rename from ruoyi-mall/src/main/java/com/cyl/manager/aws/pojo/vo/SystemStatisticsVO.java rename to ruoyi-mall/src/main/java/com/cyl/manager/aws/domain/vo/SystemStatisticsVO.java index bb5b2b2..bb8c3ca 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/aws/pojo/vo/SystemStatisticsVO.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/aws/domain/vo/SystemStatisticsVO.java @@ -1,4 +1,4 @@ -package com.cyl.manager.aws.pojo.vo; +package com.cyl.manager.aws.domain.vo; import java.math.BigDecimal; import java.time.LocalDateTime; diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/aws/mapper/SystemStatisticsMapper.java b/ruoyi-mall/src/main/java/com/cyl/manager/aws/mapper/SystemStatisticsMapper.java index 304a86e..f124338 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/aws/mapper/SystemStatisticsMapper.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/aws/mapper/SystemStatisticsMapper.java @@ -2,8 +2,7 @@ package com.cyl.manager.aws.mapper; import java.util.List; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Param; -import com.cyl.manager.aws.domain.SystemStatistics; +import com.cyl.manager.aws.domain.entity.SystemStatistics; /** * 系统数据统计Mapper接口 diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/aws/service/SystemStatisticsService.java b/ruoyi-mall/src/main/java/com/cyl/manager/aws/service/SystemStatisticsService.java index 92f6155..1082d1b 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/aws/service/SystemStatisticsService.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/aws/service/SystemStatisticsService.java @@ -4,21 +4,17 @@ import java.math.BigDecimal; import java.time.LocalDate; import java.time.LocalDateTime; import java.time.LocalTime; -import java.util.Arrays; import java.util.LinkedHashMap; import java.util.List; -import java.time.LocalDateTime; import java.util.Map; import java.util.stream.Collectors; import cn.hutool.core.collection.CollectionUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.cyl.manager.oms.domain.Aftersale; +import com.cyl.manager.oms.domain.entity.Aftersale; import com.cyl.manager.oms.mapper.AftersaleMapper; import com.cyl.manager.oms.mapper.OrderMapper; -import com.cyl.manager.ums.domain.Member; -import com.cyl.manager.ums.domain.MemberCart; +import com.cyl.manager.ums.domain.entity.Member; import com.cyl.manager.ums.mapper.MemberCartMapper; import com.cyl.manager.ums.mapper.MemberLogininforMapper; 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.data.domain.PageImpl; import org.springframework.data.domain.Pageable; -import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import com.cyl.manager.aws.mapper.SystemStatisticsMapper; -import com.cyl.manager.aws.domain.SystemStatistics; -import com.cyl.manager.aws.pojo.query.SystemStatisticsQuery; +import com.cyl.manager.aws.domain.entity.SystemStatistics; +import com.cyl.manager.aws.domain.query.SystemStatisticsQuery; /** * 系统数据统计Service业务层处理 diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/oms/controller/AftersaleController.java b/ruoyi-mall/src/main/java/com/cyl/manager/oms/controller/AftersaleController.java index 9d714aa..b970da0 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/oms/controller/AftersaleController.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/oms/controller/AftersaleController.java @@ -2,11 +2,11 @@ package com.cyl.manager.oms.controller; import java.util.List; -import com.cyl.manager.oms.pojo.request.DealWithAftersaleRequest; -import com.cyl.manager.oms.pojo.request.ManagerAftersaleOrderRequest; -import com.cyl.manager.oms.pojo.vo.ManagerRefundOrderDetailVO; -import com.cyl.manager.oms.pojo.vo.ManagerRefundOrderVO; -import com.cyl.manager.oms.pojo.vo.OrderOperateHistoryVO; +import com.cyl.manager.oms.domain.form.DealWithAftersaleRequest; +import com.cyl.manager.oms.domain.form.ManagerAftersaleOrderRequest; +import com.cyl.manager.oms.domain.vo.ManagerRefundOrderDetailVO; +import com.cyl.manager.oms.domain.vo.ManagerRefundOrderVO; +import com.cyl.manager.oms.domain.vo.OrderOperateHistoryVO; import com.ruoyi.common.core.domain.model.LoginUser; import com.ruoyi.common.core.redis.RedisService; 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.enums.BusinessType; import com.cyl.manager.oms.convert.AftersaleConvert; -import com.cyl.manager.oms.domain.Aftersale; -import com.cyl.manager.oms.pojo.query.AftersaleQuery; +import com.cyl.manager.oms.domain.entity.Aftersale; +import com.cyl.manager.oms.domain.query.AftersaleQuery; import com.cyl.manager.oms.service.AftersaleService; /** diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/oms/controller/AftersaleItemController.java b/ruoyi-mall/src/main/java/com/cyl/manager/oms/controller/AftersaleItemController.java index 8dcd656..0b3e9cc 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/oms/controller/AftersaleItemController.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/oms/controller/AftersaleItemController.java @@ -22,10 +22,10 @@ import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.enums.BusinessType; import com.cyl.manager.oms.convert.AftersaleItemConvert; -import com.cyl.manager.oms.domain.AftersaleItem; -import com.cyl.manager.oms.pojo.query.AftersaleItemQuery; +import com.cyl.manager.oms.domain.entity.AftersaleItem; +import com.cyl.manager.oms.domain.query.AftersaleItemQuery; 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; /** * 订单售后Controller diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/oms/controller/OrderController.java b/ruoyi-mall/src/main/java/com/cyl/manager/oms/controller/OrderController.java index 7a5a74b..2f49fd3 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/oms/controller/OrderController.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/oms/controller/OrderController.java @@ -1,13 +1,13 @@ package com.cyl.manager.oms.controller; import com.cyl.manager.oms.convert.OrderConvert; -import com.cyl.manager.oms.domain.Order; -import com.cyl.manager.oms.pojo.query.OrderQuery; -import com.cyl.manager.oms.pojo.request.DeliverProductRequest; -import com.cyl.manager.oms.pojo.request.ManagerOrderQueryRequest; -import com.cyl.manager.oms.pojo.vo.ManagerOrderDetailVO; -import com.cyl.manager.oms.pojo.vo.ManagerOrderVO; -import com.cyl.manager.oms.pojo.vo.OrderOperateHistoryVO; +import com.cyl.manager.oms.domain.entity.Order; +import com.cyl.manager.oms.domain.query.OrderQuery; +import com.cyl.manager.oms.domain.form.DeliverProductRequest; +import com.cyl.manager.oms.domain.form.ManagerOrderQueryRequest; +import com.cyl.manager.oms.domain.vo.ManagerOrderDetailVO; +import com.cyl.manager.oms.domain.vo.ManagerOrderVO; +import com.cyl.manager.oms.domain.vo.OrderOperateHistoryVO; import com.cyl.manager.oms.service.OrderService; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.controller.BaseController; diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/oms/controller/OrderDeliveryHistoryController.java b/ruoyi-mall/src/main/java/com/cyl/manager/oms/controller/OrderDeliveryHistoryController.java index 312d08d..4b6d38f 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/oms/controller/OrderDeliveryHistoryController.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/oms/controller/OrderDeliveryHistoryController.java @@ -22,10 +22,10 @@ import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.enums.BusinessType; import com.cyl.manager.oms.convert.OrderDeliveryHistoryConvert; -import com.cyl.manager.oms.domain.OrderDeliveryHistory; -import com.cyl.manager.oms.pojo.query.OrderDeliveryHistoryQuery; +import com.cyl.manager.oms.domain.entity.OrderDeliveryHistory; +import com.cyl.manager.oms.domain.query.OrderDeliveryHistoryQuery; 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; /** * 订单发货记录Controller diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/oms/controller/OrderItemController.java b/ruoyi-mall/src/main/java/com/cyl/manager/oms/controller/OrderItemController.java index 0943b77..a428fbf 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/oms/controller/OrderItemController.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/oms/controller/OrderItemController.java @@ -22,10 +22,10 @@ import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.enums.BusinessType; import com.cyl.manager.oms.convert.OrderItemConvert; -import com.cyl.manager.oms.domain.OrderItem; -import com.cyl.manager.oms.pojo.query.OrderItemQuery; +import com.cyl.manager.oms.domain.entity.OrderItem; +import com.cyl.manager.oms.domain.query.OrderItemQuery; 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; /** * 订单中所包含的商品Controller diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/oms/controller/OrderOperateHistoryController.java b/ruoyi-mall/src/main/java/com/cyl/manager/oms/controller/OrderOperateHistoryController.java index 1496cd8..d52d945 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/oms/controller/OrderOperateHistoryController.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/oms/controller/OrderOperateHistoryController.java @@ -22,10 +22,10 @@ import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.enums.BusinessType; import com.cyl.manager.oms.convert.OrderOperateHistoryConvert; -import com.cyl.manager.oms.domain.OrderOperateHistory; -import com.cyl.manager.oms.pojo.query.OrderOperateHistoryQuery; +import com.cyl.manager.oms.domain.entity.OrderOperateHistory; +import com.cyl.manager.oms.domain.query.OrderOperateHistoryQuery; 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; /** * 订单操作历史记录Controller diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/oms/controller/WechatPaymentHistoryController.java b/ruoyi-mall/src/main/java/com/cyl/manager/oms/controller/WechatPaymentHistoryController.java index e1736a2..4162602 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/oms/controller/WechatPaymentHistoryController.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/oms/controller/WechatPaymentHistoryController.java @@ -2,7 +2,7 @@ package com.cyl.manager.oms.controller; 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.ApiOperation; 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.enums.BusinessType; 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.pojo.vo.WechatPaymentHistoryVO; +import com.cyl.manager.oms.domain.vo.WechatPaymentHistoryVO; import com.ruoyi.common.utils.poi.ExcelUtil; /** * 微信订单表Controller diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/oms/convert/AftersaleConvert.java b/ruoyi-mall/src/main/java/com/cyl/manager/oms/convert/AftersaleConvert.java index 49646d4..49033dc 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/oms/convert/AftersaleConvert.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/oms/convert/AftersaleConvert.java @@ -1,8 +1,8 @@ package com.cyl.manager.oms.convert; import org.mapstruct.Mapper; -import com.cyl.manager.oms.domain.Aftersale; -import com.cyl.manager.oms.pojo.vo.AftersaleVO; +import com.cyl.manager.oms.domain.entity.Aftersale; +import com.cyl.manager.oms.domain.vo.AftersaleVO; import java.util.List; /** * 订单售后 DO <=> DTO <=> VO / BO / Query diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/oms/convert/AftersaleItemConvert.java b/ruoyi-mall/src/main/java/com/cyl/manager/oms/convert/AftersaleItemConvert.java index b26772b..a2121e9 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/oms/convert/AftersaleItemConvert.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/oms/convert/AftersaleItemConvert.java @@ -1,8 +1,8 @@ package com.cyl.manager.oms.convert; import org.mapstruct.Mapper; -import com.cyl.manager.oms.domain.AftersaleItem; -import com.cyl.manager.oms.pojo.vo.AftersaleItemVO; +import com.cyl.manager.oms.domain.entity.AftersaleItem; +import com.cyl.manager.oms.domain.vo.AftersaleItemVO; import java.util.List; /** * 订单售后 DO <=> DTO <=> VO / BO / Query diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/oms/convert/OrderConvert.java b/ruoyi-mall/src/main/java/com/cyl/manager/oms/convert/OrderConvert.java index dd1a51f..57d580c 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/oms/convert/OrderConvert.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/oms/convert/OrderConvert.java @@ -1,8 +1,8 @@ package com.cyl.manager.oms.convert; import org.mapstruct.Mapper; -import com.cyl.manager.oms.domain.Order; -import com.cyl.manager.oms.pojo.vo.OrderVO; +import com.cyl.manager.oms.domain.entity.Order; +import com.cyl.manager.oms.domain.vo.OrderVO; import java.util.List; /** * 订单表 DO <=> DTO <=> VO / BO / Query diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/oms/convert/OrderDeliveryHistoryConvert.java b/ruoyi-mall/src/main/java/com/cyl/manager/oms/convert/OrderDeliveryHistoryConvert.java index d7aa110..ebed6e4 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/oms/convert/OrderDeliveryHistoryConvert.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/oms/convert/OrderDeliveryHistoryConvert.java @@ -1,8 +1,8 @@ package com.cyl.manager.oms.convert; import org.mapstruct.Mapper; -import com.cyl.manager.oms.domain.OrderDeliveryHistory; -import com.cyl.manager.oms.pojo.vo.OrderDeliveryHistoryVO; +import com.cyl.manager.oms.domain.entity.OrderDeliveryHistory; +import com.cyl.manager.oms.domain.vo.OrderDeliveryHistoryVO; import java.util.List; /** * 订单发货记录 DO <=> DTO <=> VO / BO / Query diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/oms/convert/OrderItemConvert.java b/ruoyi-mall/src/main/java/com/cyl/manager/oms/convert/OrderItemConvert.java index ed05be5..95e93b0 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/oms/convert/OrderItemConvert.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/oms/convert/OrderItemConvert.java @@ -1,8 +1,8 @@ package com.cyl.manager.oms.convert; import org.mapstruct.Mapper; -import com.cyl.manager.oms.domain.OrderItem; -import com.cyl.manager.oms.pojo.vo.OrderItemVO; +import com.cyl.manager.oms.domain.entity.OrderItem; +import com.cyl.manager.oms.domain.vo.OrderItemVO; import java.util.List; /** * 订单中所包含的商品 DO <=> DTO <=> VO / BO / Query diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/oms/convert/OrderOperateHistoryConvert.java b/ruoyi-mall/src/main/java/com/cyl/manager/oms/convert/OrderOperateHistoryConvert.java index f1ee3a2..54eb4d5 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/oms/convert/OrderOperateHistoryConvert.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/oms/convert/OrderOperateHistoryConvert.java @@ -1,8 +1,8 @@ package com.cyl.manager.oms.convert; import org.mapstruct.Mapper; -import com.cyl.manager.oms.domain.OrderOperateHistory; -import com.cyl.manager.oms.pojo.vo.OrderOperateHistoryVO; +import com.cyl.manager.oms.domain.entity.OrderOperateHistory; +import com.cyl.manager.oms.domain.vo.OrderOperateHistoryVO; import java.util.List; /** * 订单操作历史记录 DO <=> DTO <=> VO / BO / Query diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/oms/convert/WechatPaymentHistoryConvert.java b/ruoyi-mall/src/main/java/com/cyl/manager/oms/convert/WechatPaymentHistoryConvert.java index c4ca162..9de3851 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/oms/convert/WechatPaymentHistoryConvert.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/oms/convert/WechatPaymentHistoryConvert.java @@ -1,8 +1,8 @@ package com.cyl.manager.oms.convert; import org.mapstruct.Mapper; -import com.cyl.manager.oms.domain.WechatPaymentHistory; -import com.cyl.manager.oms.pojo.vo.WechatPaymentHistoryVO; +import com.cyl.manager.oms.domain.entity.WechatPaymentHistory; +import com.cyl.manager.oms.domain.vo.WechatPaymentHistoryVO; import java.util.List; /** * 微信订单表 DO <=> DTO <=> VO / BO / Query diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/Aftersale.java b/ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/entity/Aftersale.java similarity index 98% rename from ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/Aftersale.java rename to ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/entity/Aftersale.java index ff88449..448af4b 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/Aftersale.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/entity/Aftersale.java @@ -1,4 +1,4 @@ -package com.cyl.manager.oms.domain; +package com.cyl.manager.oms.domain.entity; import java.math.BigDecimal; import java.time.LocalDateTime; diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/AftersaleItem.java b/ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/entity/AftersaleItem.java similarity index 96% rename from ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/AftersaleItem.java rename to ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/entity/AftersaleItem.java index cbc9ac5..80b1859 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/AftersaleItem.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/entity/AftersaleItem.java @@ -1,4 +1,4 @@ -package com.cyl.manager.oms.domain; +package com.cyl.manager.oms.domain.entity; import java.math.BigDecimal; import com.ruoyi.common.annotation.Excel; diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/Order.java b/ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/entity/Order.java similarity index 99% rename from ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/Order.java rename to ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/entity/Order.java index 8a4aee8..263f8b1 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/Order.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/entity/Order.java @@ -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.TableId; diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/OrderDeliveryHistory.java b/ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/entity/OrderDeliveryHistory.java similarity index 95% rename from ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/OrderDeliveryHistory.java rename to ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/entity/OrderDeliveryHistory.java index efefcca..9ad6c5a 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/OrderDeliveryHistory.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/entity/OrderDeliveryHistory.java @@ -1,4 +1,4 @@ -package com.cyl.manager.oms.domain; +package com.cyl.manager.oms.domain.entity; import com.ruoyi.common.annotation.Excel; import io.swagger.annotations.ApiModel; diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/OrderItem.java b/ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/entity/OrderItem.java similarity index 98% rename from ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/OrderItem.java rename to ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/entity/OrderItem.java index 461f0fa..7a82ffa 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/OrderItem.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/entity/OrderItem.java @@ -1,4 +1,4 @@ -package com.cyl.manager.oms.domain; +package com.cyl.manager.oms.domain.entity; import java.math.BigDecimal; diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/OrderOperateHistory.java b/ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/entity/OrderOperateHistory.java similarity index 96% rename from ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/OrderOperateHistory.java rename to ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/entity/OrderOperateHistory.java index fe18fc6..2c47f3c 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/OrderOperateHistory.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/entity/OrderOperateHistory.java @@ -1,4 +1,4 @@ -package com.cyl.manager.oms.domain; +package com.cyl.manager.oms.domain.entity; import com.ruoyi.common.annotation.Excel; import io.swagger.annotations.ApiModel; diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/WechatPaymentHistory.java b/ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/entity/WechatPaymentHistory.java similarity index 98% rename from ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/WechatPaymentHistory.java rename to ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/entity/WechatPaymentHistory.java index 2327111..22eb291 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/WechatPaymentHistory.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/entity/WechatPaymentHistory.java @@ -1,4 +1,4 @@ -package com.cyl.manager.oms.domain; +package com.cyl.manager.oms.domain.entity; import java.math.BigDecimal; import com.ruoyi.common.annotation.Excel; diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/request/DealWithAftersaleRequest.java b/ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/form/DealWithAftersaleRequest.java similarity index 94% rename from ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/request/DealWithAftersaleRequest.java rename to ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/form/DealWithAftersaleRequest.java index cd10737..4cb151e 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/request/DealWithAftersaleRequest.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/form/DealWithAftersaleRequest.java @@ -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.ApiModelProperty; import lombok.Data; diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/request/DeliverProductRequest.java b/ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/form/DeliverProductRequest.java similarity index 94% rename from ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/request/DeliverProductRequest.java rename to ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/form/DeliverProductRequest.java index 4a9b4a1..a23f4b4 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/request/DeliverProductRequest.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/form/DeliverProductRequest.java @@ -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 io.swagger.annotations.ApiModelProperty; import lombok.Getter; diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/request/ManagerAftersaleOrderRequest.java b/ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/form/ManagerAftersaleOrderRequest.java similarity index 96% rename from ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/request/ManagerAftersaleOrderRequest.java rename to ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/form/ManagerAftersaleOrderRequest.java index 387f5a7..c278152 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/request/ManagerAftersaleOrderRequest.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/form/ManagerAftersaleOrderRequest.java @@ -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 io.swagger.annotations.ApiModel; @@ -7,7 +7,6 @@ import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; -import java.util.Date; @Data diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/request/ManagerOrderQueryRequest.java b/ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/form/ManagerOrderQueryRequest.java similarity index 97% rename from ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/request/ManagerOrderQueryRequest.java rename to ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/form/ManagerOrderQueryRequest.java index 384eaff..eddaefe 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/request/ManagerOrderQueryRequest.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/form/ManagerOrderQueryRequest.java @@ -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 io.swagger.annotations.ApiModel; @@ -7,7 +7,6 @@ import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; -import java.util.Date; @Data @ApiModel("后台订单查询请求体") diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/query/AftersaleItemQuery.java b/ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/query/AftersaleItemQuery.java similarity index 94% rename from ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/query/AftersaleItemQuery.java rename to ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/query/AftersaleItemQuery.java index a1359b9..c3ced9f 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/query/AftersaleItemQuery.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/query/AftersaleItemQuery.java @@ -1,4 +1,4 @@ -package com.cyl.manager.oms.pojo.query; +package com.cyl.manager.oms.domain.query; import java.math.BigDecimal; import lombok.Data; diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/query/AftersaleQuery.java b/ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/query/AftersaleQuery.java similarity index 97% rename from ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/query/AftersaleQuery.java rename to ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/query/AftersaleQuery.java index f9c4183..e0cfa2c 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/query/AftersaleQuery.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/query/AftersaleQuery.java @@ -1,4 +1,4 @@ -package com.cyl.manager.oms.pojo.query; +package com.cyl.manager.oms.domain.query; import java.math.BigDecimal; import java.time.LocalDateTime; diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/query/OrderDeliveryHistoryQuery.java b/ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/query/OrderDeliveryHistoryQuery.java similarity index 92% rename from ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/query/OrderDeliveryHistoryQuery.java rename to ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/query/OrderDeliveryHistoryQuery.java index 94ca109..97c9799 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/query/OrderDeliveryHistoryQuery.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/query/OrderDeliveryHistoryQuery.java @@ -1,4 +1,4 @@ -package com.cyl.manager.oms.pojo.query; +package com.cyl.manager.oms.domain.query; import lombok.Data; import io.swagger.annotations.ApiModel; diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/query/OrderItemQuery.java b/ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/query/OrderItemQuery.java similarity index 97% rename from ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/query/OrderItemQuery.java rename to ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/query/OrderItemQuery.java index 52c5dbe..3ad70ca 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/query/OrderItemQuery.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/query/OrderItemQuery.java @@ -1,4 +1,4 @@ -package com.cyl.manager.oms.pojo.query; +package com.cyl.manager.oms.domain.query; import java.math.BigDecimal; import lombok.Data; diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/query/OrderOperateHistoryQuery.java b/ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/query/OrderOperateHistoryQuery.java similarity index 94% rename from ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/query/OrderOperateHistoryQuery.java rename to ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/query/OrderOperateHistoryQuery.java index 90c9a86..53e7d47 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/query/OrderOperateHistoryQuery.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/query/OrderOperateHistoryQuery.java @@ -1,4 +1,4 @@ -package com.cyl.manager.oms.pojo.query; +package com.cyl.manager.oms.domain.query; import lombok.Data; import io.swagger.annotations.ApiModel; diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/query/OrderQuery.java b/ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/query/OrderQuery.java similarity index 98% rename from ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/query/OrderQuery.java rename to ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/query/OrderQuery.java index 09d9cbb..98b2f21 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/query/OrderQuery.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/query/OrderQuery.java @@ -1,4 +1,4 @@ -package com.cyl.manager.oms.pojo.query; +package com.cyl.manager.oms.domain.query; import java.math.BigDecimal; import java.time.LocalDateTime; diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/query/WechatPaymentHistoryQuery.java b/ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/query/WechatPaymentHistoryQuery.java similarity index 96% rename from ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/query/WechatPaymentHistoryQuery.java rename to ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/query/WechatPaymentHistoryQuery.java index ec63ab8..daf4151 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/query/WechatPaymentHistoryQuery.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/query/WechatPaymentHistoryQuery.java @@ -1,4 +1,4 @@ -package com.cyl.manager.oms.pojo.query; +package com.cyl.manager.oms.domain.query; import java.math.BigDecimal; import lombok.Data; diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/vo/AftersaleItemVO.java b/ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/vo/AftersaleItemVO.java similarity index 95% rename from ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/vo/AftersaleItemVO.java rename to ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/vo/AftersaleItemVO.java index 688214e..d695fcc 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/vo/AftersaleItemVO.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/vo/AftersaleItemVO.java @@ -1,4 +1,4 @@ -package com.cyl.manager.oms.pojo.vo; +package com.cyl.manager.oms.domain.vo; import java.math.BigDecimal; import com.ruoyi.common.annotation.Excel; diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/vo/AftersaleVO.java b/ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/vo/AftersaleVO.java similarity index 97% rename from ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/vo/AftersaleVO.java rename to ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/vo/AftersaleVO.java index 7b0d1d7..dfc8494 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/vo/AftersaleVO.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/vo/AftersaleVO.java @@ -1,4 +1,4 @@ -package com.cyl.manager.oms.pojo.vo; +package com.cyl.manager.oms.domain.vo; import java.math.BigDecimal; import java.time.LocalDateTime; diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/vo/ManagerOrderAddressVo.java b/ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/vo/ManagerOrderAddressVo.java similarity index 93% rename from ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/vo/ManagerOrderAddressVo.java rename to ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/vo/ManagerOrderAddressVo.java index b7022dd..5ddd4b3 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/vo/ManagerOrderAddressVo.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/vo/ManagerOrderAddressVo.java @@ -1,4 +1,4 @@ -package com.cyl.manager.oms.pojo.vo; +package com.cyl.manager.oms.domain.vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/vo/ManagerOrderDetailVO.java b/ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/vo/ManagerOrderDetailVO.java similarity index 97% rename from ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/vo/ManagerOrderDetailVO.java rename to ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/vo/ManagerOrderDetailVO.java index ff75f25..382c977 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/vo/ManagerOrderDetailVO.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/vo/ManagerOrderDetailVO.java @@ -1,4 +1,4 @@ -package com.cyl.manager.oms.pojo.vo; +package com.cyl.manager.oms.domain.vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/vo/ManagerOrderProductVO.java b/ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/vo/ManagerOrderProductVO.java similarity index 93% rename from ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/vo/ManagerOrderProductVO.java rename to ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/vo/ManagerOrderProductVO.java index c113ac4..69bd1a4 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/vo/ManagerOrderProductVO.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/vo/ManagerOrderProductVO.java @@ -1,4 +1,4 @@ -package com.cyl.manager.oms.pojo.vo; +package com.cyl.manager.oms.domain.vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/vo/ManagerOrderVO.java b/ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/vo/ManagerOrderVO.java similarity index 99% rename from ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/vo/ManagerOrderVO.java rename to ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/vo/ManagerOrderVO.java index df70dff..b0fd5de 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/vo/ManagerOrderVO.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/vo/ManagerOrderVO.java @@ -1,4 +1,4 @@ -package com.cyl.manager.oms.pojo.vo; +package com.cyl.manager.oms.domain.vo; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/vo/ManagerRefundOrderDetailVO.java b/ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/vo/ManagerRefundOrderDetailVO.java similarity index 94% rename from ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/vo/ManagerRefundOrderDetailVO.java rename to ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/vo/ManagerRefundOrderDetailVO.java index eabd0ef..4deb015 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/vo/ManagerRefundOrderDetailVO.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/vo/ManagerRefundOrderDetailVO.java @@ -1,14 +1,11 @@ -package com.cyl.manager.oms.pojo.vo; +package com.cyl.manager.oms.domain.vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import lombok.Getter; -import lombok.Setter; import java.math.BigDecimal; import java.time.LocalDateTime; -import java.util.Date; import java.util.List; /** diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/vo/ManagerRefundOrderVO.java b/ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/vo/ManagerRefundOrderVO.java similarity index 98% rename from ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/vo/ManagerRefundOrderVO.java rename to ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/vo/ManagerRefundOrderVO.java index c83e9e1..1ff852b 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/vo/ManagerRefundOrderVO.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/vo/ManagerRefundOrderVO.java @@ -1,4 +1,4 @@ - package com.cyl.manager.oms.pojo.vo; + package com.cyl.manager.oms.domain.vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/vo/OrderAddressVO.java b/ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/vo/OrderAddressVO.java similarity index 93% rename from ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/vo/OrderAddressVO.java rename to ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/vo/OrderAddressVO.java index 7967211..ff1caaf 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/vo/OrderAddressVO.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/vo/OrderAddressVO.java @@ -1,4 +1,4 @@ -package com.cyl.manager.oms.pojo.vo; +package com.cyl.manager.oms.domain.vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/vo/OrderDeliveryHistoryVO.java b/ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/vo/OrderDeliveryHistoryVO.java similarity index 93% rename from ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/vo/OrderDeliveryHistoryVO.java rename to ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/vo/OrderDeliveryHistoryVO.java index 532d94c..ed5f8c9 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/vo/OrderDeliveryHistoryVO.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/vo/OrderDeliveryHistoryVO.java @@ -1,4 +1,4 @@ -package com.cyl.manager.oms.pojo.vo; +package com.cyl.manager.oms.domain.vo; import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.core.domain.BaseAudit; diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/vo/OrderItemVO.java b/ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/vo/OrderItemVO.java similarity index 97% rename from ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/vo/OrderItemVO.java rename to ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/vo/OrderItemVO.java index 543dd9c..db05372 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/vo/OrderItemVO.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/vo/OrderItemVO.java @@ -1,4 +1,4 @@ -package com.cyl.manager.oms.pojo.vo; +package com.cyl.manager.oms.domain.vo; import java.math.BigDecimal; import com.ruoyi.common.annotation.Excel; diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/vo/OrderOperateHistoryVO.java b/ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/vo/OrderOperateHistoryVO.java similarity index 96% rename from ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/vo/OrderOperateHistoryVO.java rename to ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/vo/OrderOperateHistoryVO.java index d521f19..62074a1 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/vo/OrderOperateHistoryVO.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/vo/OrderOperateHistoryVO.java @@ -1,4 +1,4 @@ -package com.cyl.manager.oms.pojo.vo; +package com.cyl.manager.oms.domain.vo; import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.core.domain.BaseAudit; diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/vo/OrderVO.java b/ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/vo/OrderVO.java similarity index 97% rename from ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/vo/OrderVO.java rename to ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/vo/OrderVO.java index cc67917..1d0231d 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/vo/OrderVO.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/vo/OrderVO.java @@ -1,10 +1,10 @@ -package com.cyl.manager.oms.pojo.vo; +package com.cyl.manager.oms.domain.vo; import java.math.BigDecimal; import java.time.LocalDateTime; import java.util.List; -import com.cyl.manager.oms.domain.OrderItem; +import com.cyl.manager.oms.domain.entity.OrderItem; import com.ruoyi.common.annotation.Excel; import com.fasterxml.jackson.annotation.JsonFormat; import com.ruoyi.common.core.domain.BaseAudit; diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/vo/RefundInfoVO.java b/ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/vo/RefundInfoVO.java similarity index 95% rename from ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/vo/RefundInfoVO.java rename to ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/vo/RefundInfoVO.java index 51c6dbf..60e74d3 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/vo/RefundInfoVO.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/vo/RefundInfoVO.java @@ -1,4 +1,4 @@ -package com.cyl.manager.oms.pojo.vo; +package com.cyl.manager.oms.domain.vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -7,7 +7,6 @@ import lombok.Setter; import java.math.BigDecimal; import java.time.LocalDateTime; -import java.util.Date; /** * @author: Jinxin diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/vo/WechatPaymentHistoryVO.java b/ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/vo/WechatPaymentHistoryVO.java similarity index 97% rename from ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/vo/WechatPaymentHistoryVO.java rename to ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/vo/WechatPaymentHistoryVO.java index 349faf1..20c7d19 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/vo/WechatPaymentHistoryVO.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/vo/WechatPaymentHistoryVO.java @@ -1,4 +1,4 @@ -package com.cyl.manager.oms.pojo.vo; +package com.cyl.manager.oms.domain.vo; import java.math.BigDecimal; import com.ruoyi.common.annotation.Excel; diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/oms/mapper/AftersaleItemMapper.java b/ruoyi-mall/src/main/java/com/cyl/manager/oms/mapper/AftersaleItemMapper.java index 0bd640e..f81ae21 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/oms/mapper/AftersaleItemMapper.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/oms/mapper/AftersaleItemMapper.java @@ -2,7 +2,7 @@ package com.cyl.manager.oms.mapper; import java.util.List; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.cyl.manager.oms.domain.AftersaleItem; +import com.cyl.manager.oms.domain.entity.AftersaleItem; import org.apache.ibatis.annotations.Param; /** diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/oms/mapper/AftersaleMapper.java b/ruoyi-mall/src/main/java/com/cyl/manager/oms/mapper/AftersaleMapper.java index 540f99b..77482a0 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/oms/mapper/AftersaleMapper.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/oms/mapper/AftersaleMapper.java @@ -2,12 +2,10 @@ package com.cyl.manager.oms.mapper; import java.util.List; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.cyl.manager.oms.domain.Aftersale; -import com.cyl.manager.oms.domain.AftersaleItem; -import com.cyl.manager.oms.pojo.request.ManagerAftersaleOrderRequest; -import com.cyl.manager.oms.pojo.vo.ManagerRefundOrderVO; -import com.cyl.manager.statistics.pojo.vo.OrderAndAftersaleStatisticsVO; -import org.apache.ibatis.annotations.Param; +import com.cyl.manager.oms.domain.entity.Aftersale; +import com.cyl.manager.oms.domain.form.ManagerAftersaleOrderRequest; +import com.cyl.manager.oms.domain.vo.ManagerRefundOrderVO; +import com.cyl.manager.statistics.domain.vo.OrderAndAftersaleStatisticsVO; /** * 订单售后Mapper接口 diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/oms/mapper/OrderDeliveryHistoryMapper.java b/ruoyi-mall/src/main/java/com/cyl/manager/oms/mapper/OrderDeliveryHistoryMapper.java index a4003f0..7386a77 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/oms/mapper/OrderDeliveryHistoryMapper.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/oms/mapper/OrderDeliveryHistoryMapper.java @@ -2,7 +2,7 @@ package com.cyl.manager.oms.mapper; import java.util.List; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.cyl.manager.oms.domain.OrderDeliveryHistory; +import com.cyl.manager.oms.domain.entity.OrderDeliveryHistory; /** * 订单发货记录Mapper接口 diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/oms/mapper/OrderItemMapper.java b/ruoyi-mall/src/main/java/com/cyl/manager/oms/mapper/OrderItemMapper.java index f8ee2c4..b7aee2e 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/oms/mapper/OrderItemMapper.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/oms/mapper/OrderItemMapper.java @@ -2,7 +2,7 @@ package com.cyl.manager.oms.mapper; import java.util.List; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.cyl.manager.oms.domain.OrderItem; +import com.cyl.manager.oms.domain.entity.OrderItem; /** * 订单中所包含的商品Mapper接口 diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/oms/mapper/OrderMapper.java b/ruoyi-mall/src/main/java/com/cyl/manager/oms/mapper/OrderMapper.java index 94ebb0b..1bee267 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/oms/mapper/OrderMapper.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/oms/mapper/OrderMapper.java @@ -3,14 +3,14 @@ package com.cyl.manager.oms.mapper; import java.time.LocalDateTime; import java.util.List; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.cyl.h5.pojo.vo.CountOrderVO; -import com.cyl.h5.pojo.vo.H5OrderVO; -import com.cyl.manager.aws.domain.SystemStatistics; -import com.cyl.manager.oms.domain.Order; -import com.cyl.manager.oms.pojo.request.ManagerOrderQueryRequest; -import com.cyl.manager.oms.pojo.vo.ManagerOrderVO; -import com.cyl.manager.statistics.pojo.vo.OrderAndAftersaleStatisticsVO; -import com.cyl.manager.ums.pojo.vo.MemberDataStatisticsVO; +import com.cyl.h5.domain.vo.CountOrderVO; +import com.cyl.h5.domain.vo.H5OrderVO; +import com.cyl.manager.aws.domain.entity.SystemStatistics; +import com.cyl.manager.oms.domain.entity.Order; +import com.cyl.manager.oms.domain.form.ManagerOrderQueryRequest; +import com.cyl.manager.oms.domain.vo.ManagerOrderVO; +import com.cyl.manager.statistics.domain.vo.OrderAndAftersaleStatisticsVO; +import com.cyl.manager.ums.domain.vo.MemberDataStatisticsVO; import org.apache.ibatis.annotations.Param; /** diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/oms/mapper/OrderOperateHistoryMapper.java b/ruoyi-mall/src/main/java/com/cyl/manager/oms/mapper/OrderOperateHistoryMapper.java index e17ece1..69baa86 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/oms/mapper/OrderOperateHistoryMapper.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/oms/mapper/OrderOperateHistoryMapper.java @@ -2,7 +2,7 @@ package com.cyl.manager.oms.mapper; import java.util.List; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.cyl.manager.oms.domain.OrderOperateHistory; +import com.cyl.manager.oms.domain.entity.OrderOperateHistory; /** * 订单操作历史记录Mapper接口 diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/oms/mapper/WechatPaymentHistoryMapper.java b/ruoyi-mall/src/main/java/com/cyl/manager/oms/mapper/WechatPaymentHistoryMapper.java index a19b030..181a46d 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/oms/mapper/WechatPaymentHistoryMapper.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/oms/mapper/WechatPaymentHistoryMapper.java @@ -2,7 +2,7 @@ package com.cyl.manager.oms.mapper; import java.util.List; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.cyl.manager.oms.domain.WechatPaymentHistory; +import com.cyl.manager.oms.domain.entity.WechatPaymentHistory; /** * 微信订单表Mapper接口 diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/oms/service/AftersaleItemService.java b/ruoyi-mall/src/main/java/com/cyl/manager/oms/service/AftersaleItemService.java index 641396f..5720f66 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/oms/service/AftersaleItemService.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/oms/service/AftersaleItemService.java @@ -9,8 +9,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import com.cyl.manager.oms.mapper.AftersaleItemMapper; -import com.cyl.manager.oms.domain.AftersaleItem; -import com.cyl.manager.oms.pojo.query.AftersaleItemQuery; +import com.cyl.manager.oms.domain.entity.AftersaleItem; +import com.cyl.manager.oms.domain.query.AftersaleItemQuery; /** * 订单售后Service业务层处理 diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/oms/service/AftersaleService.java b/ruoyi-mall/src/main/java/com/cyl/manager/oms/service/AftersaleService.java index ee8b223..e26a8af 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/oms/service/AftersaleService.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/oms/service/AftersaleService.java @@ -10,17 +10,17 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.cyl.manager.oms.convert.OrderOperateHistoryConvert; -import com.cyl.manager.oms.domain.Order; -import com.cyl.manager.oms.domain.OrderItem; -import com.cyl.manager.oms.domain.OrderOperateHistory; +import com.cyl.manager.oms.domain.entity.Order; +import com.cyl.manager.oms.domain.entity.OrderItem; +import com.cyl.manager.oms.domain.entity.OrderOperateHistory; import com.cyl.manager.oms.mapper.OrderItemMapper; import com.cyl.manager.oms.mapper.OrderMapper; import com.cyl.manager.oms.mapper.OrderOperateHistoryMapper; -import com.cyl.manager.oms.pojo.request.DealWithAftersaleRequest; -import com.cyl.manager.oms.pojo.request.ManagerAftersaleOrderRequest; -import com.cyl.manager.oms.pojo.vo.*; +import com.cyl.manager.oms.domain.form.DealWithAftersaleRequest; +import com.cyl.manager.oms.domain.form.ManagerAftersaleOrderRequest; +import com.cyl.manager.oms.domain.vo.*; 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.mapper.MemberMapper; import com.github.pagehelper.PageHelper; import com.ruoyi.common.constant.Constants; @@ -31,7 +31,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import com.cyl.manager.oms.mapper.AftersaleMapper; -import com.cyl.manager.oms.domain.Aftersale; +import com.cyl.manager.oms.domain.entity.Aftersale; import org.springframework.transaction.annotation.Transactional; /** diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/oms/service/OrderDeliveryHistoryService.java b/ruoyi-mall/src/main/java/com/cyl/manager/oms/service/OrderDeliveryHistoryService.java index 28ee548..993aecc 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/oms/service/OrderDeliveryHistoryService.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/oms/service/OrderDeliveryHistoryService.java @@ -9,8 +9,8 @@ import org.springframework.data.domain.Pageable; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import com.cyl.manager.oms.mapper.OrderDeliveryHistoryMapper; -import com.cyl.manager.oms.domain.OrderDeliveryHistory; -import com.cyl.manager.oms.pojo.query.OrderDeliveryHistoryQuery; +import com.cyl.manager.oms.domain.entity.OrderDeliveryHistory; +import com.cyl.manager.oms.domain.query.OrderDeliveryHistoryQuery; /** * 订单发货记录Service业务层处理 diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/oms/service/OrderItemService.java b/ruoyi-mall/src/main/java/com/cyl/manager/oms/service/OrderItemService.java index 2e3e5f5..73dbf5b 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/oms/service/OrderItemService.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/oms/service/OrderItemService.java @@ -6,8 +6,8 @@ import java.util.List; import java.time.LocalDateTime; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.cyl.h5.pojo.dto.OrderProductListDTO; -import com.cyl.manager.ums.domain.Member; +import com.cyl.h5.domain.dto.OrderProductListDTO; +import com.cyl.manager.ums.domain.entity.Member; import com.github.pagehelper.PageHelper; import com.ruoyi.common.utils.IDGenerator; import org.springframework.beans.factory.annotation.Autowired; @@ -15,8 +15,8 @@ import org.springframework.data.domain.Pageable; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import com.cyl.manager.oms.mapper.OrderItemMapper; -import com.cyl.manager.oms.domain.OrderItem; -import com.cyl.manager.oms.pojo.query.OrderItemQuery; +import com.cyl.manager.oms.domain.entity.OrderItem; +import com.cyl.manager.oms.domain.query.OrderItemQuery; import org.springframework.transaction.annotation.Transactional; /** diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/oms/service/OrderOperateHistoryService.java b/ruoyi-mall/src/main/java/com/cyl/manager/oms/service/OrderOperateHistoryService.java index bac0928..2ba0976 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/oms/service/OrderOperateHistoryService.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/oms/service/OrderOperateHistoryService.java @@ -12,8 +12,8 @@ import org.springframework.data.domain.Pageable; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import com.cyl.manager.oms.mapper.OrderOperateHistoryMapper; -import com.cyl.manager.oms.domain.OrderOperateHistory; -import com.cyl.manager.oms.pojo.query.OrderOperateHistoryQuery; +import com.cyl.manager.oms.domain.entity.OrderOperateHistory; +import com.cyl.manager.oms.domain.query.OrderOperateHistoryQuery; /** * 订单操作历史记录Service业务层处理 diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/oms/service/OrderService.java b/ruoyi-mall/src/main/java/com/cyl/manager/oms/service/OrderService.java index 04f9be1..18ebab4 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/oms/service/OrderService.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/oms/service/OrderService.java @@ -6,24 +6,24 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.cyl.h5.pojo.vo.query.OrderH5Query; +import com.cyl.h5.domain.query.OrderH5Query; import com.cyl.manager.oms.convert.OrderConvert; import com.cyl.manager.oms.convert.OrderOperateHistoryConvert; -import com.cyl.manager.oms.domain.Order; -import com.cyl.manager.oms.domain.OrderDeliveryHistory; -import com.cyl.manager.oms.domain.OrderItem; -import com.cyl.manager.oms.domain.OrderOperateHistory; +import com.cyl.manager.oms.domain.entity.Order; +import com.cyl.manager.oms.domain.entity.OrderDeliveryHistory; +import com.cyl.manager.oms.domain.entity.OrderItem; +import com.cyl.manager.oms.domain.entity.OrderOperateHistory; import com.cyl.manager.oms.mapper.OrderDeliveryHistoryMapper; import com.cyl.manager.oms.mapper.OrderItemMapper; import com.cyl.manager.oms.mapper.OrderMapper; import com.cyl.manager.oms.mapper.OrderOperateHistoryMapper; -import com.cyl.manager.oms.pojo.request.DeliverProductRequest; -import com.cyl.manager.oms.pojo.request.ManagerOrderQueryRequest; -import com.cyl.manager.oms.pojo.vo.*; +import com.cyl.manager.oms.domain.form.DeliverProductRequest; +import com.cyl.manager.oms.domain.form.ManagerOrderQueryRequest; +import com.cyl.manager.oms.domain.vo.*; import com.cyl.manager.pms.convert.SkuConvert; import com.cyl.manager.pms.mapper.ProductMapper; 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.mapper.MemberAddressMapper; import com.cyl.manager.ums.mapper.MemberCartMapper; import com.cyl.manager.ums.mapper.MemberMapper; diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/oms/service/WechatPaymentHistoryService.java b/ruoyi-mall/src/main/java/com/cyl/manager/oms/service/WechatPaymentHistoryService.java index feb50b5..a903a84 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/oms/service/WechatPaymentHistoryService.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/oms/service/WechatPaymentHistoryService.java @@ -4,14 +4,14 @@ import java.math.BigDecimal; import java.util.List; import java.time.LocalDateTime; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.cyl.manager.oms.domain.WechatPaymentHistory; +import com.cyl.manager.oms.domain.entity.WechatPaymentHistory; import com.github.pagehelper.PageHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Pageable; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import com.cyl.manager.oms.mapper.WechatPaymentHistoryMapper; -import com.cyl.manager.oms.pojo.query.WechatPaymentHistoryQuery; +import com.cyl.manager.oms.domain.query.WechatPaymentHistoryQuery; /** * 微信订单表Service业务层处理 diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/pms/controller/BrandController.java b/ruoyi-mall/src/main/java/com/cyl/manager/pms/controller/BrandController.java index 6a4b07a..ec325e5 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/pms/controller/BrandController.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/pms/controller/BrandController.java @@ -22,10 +22,10 @@ import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.enums.BusinessType; import com.cyl.manager.pms.convert.BrandConvert; -import com.cyl.manager.pms.domain.Brand; -import com.cyl.manager.pms.pojo.query.BrandQuery; +import com.cyl.manager.pms.domain.entity.Brand; +import com.cyl.manager.pms.domain.query.BrandQuery; import com.cyl.manager.pms.service.BrandService; -import com.cyl.manager.pms.pojo.vo.BrandVO; +import com.cyl.manager.pms.domain.vo.BrandVO; import com.ruoyi.common.utils.poi.ExcelUtil; /** * 品牌管理Controller diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/pms/controller/ProductCategoryController.java b/ruoyi-mall/src/main/java/com/cyl/manager/pms/controller/ProductCategoryController.java index 1459644..640477b 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/pms/controller/ProductCategoryController.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/pms/controller/ProductCategoryController.java @@ -19,10 +19,10 @@ import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.enums.BusinessType; import com.cyl.manager.pms.convert.ProductCategoryConvert; -import com.cyl.manager.pms.domain.ProductCategory; -import com.cyl.manager.pms.pojo.query.ProductCategoryQuery; +import com.cyl.manager.pms.domain.entity.ProductCategory; +import com.cyl.manager.pms.domain.query.ProductCategoryQuery; import com.cyl.manager.pms.service.ProductCategoryService; -import com.cyl.manager.pms.pojo.vo.ProductCategoryVO; +import com.cyl.manager.pms.domain.vo.ProductCategoryVO; /** * 商品分类Controller diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/pms/controller/ProductController.java b/ruoyi-mall/src/main/java/com/cyl/manager/pms/controller/ProductController.java index 2d4230d..a8f7d86 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/pms/controller/ProductController.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/pms/controller/ProductController.java @@ -22,10 +22,10 @@ import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.enums.BusinessType; import com.cyl.manager.pms.convert.ProductConvert; -import com.cyl.manager.pms.domain.Product; -import com.cyl.manager.pms.pojo.query.ProductQuery; +import com.cyl.manager.pms.domain.entity.Product; +import com.cyl.manager.pms.domain.query.ProductQuery; import com.cyl.manager.pms.service.ProductService; -import com.cyl.manager.pms.pojo.vo.ProductVO; +import com.cyl.manager.pms.domain.vo.ProductVO; import com.ruoyi.common.utils.poi.ExcelUtil; /** * 商品信息Controller diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/pms/controller/SkuController.java b/ruoyi-mall/src/main/java/com/cyl/manager/pms/controller/SkuController.java index 463223f..2d51255 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/pms/controller/SkuController.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/pms/controller/SkuController.java @@ -22,10 +22,10 @@ import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.enums.BusinessType; import com.cyl.manager.pms.convert.SkuConvert; -import com.cyl.manager.pms.domain.Sku; -import com.cyl.manager.pms.pojo.query.SkuQuery; +import com.cyl.manager.pms.domain.entity.Sku; +import com.cyl.manager.pms.domain.query.SkuQuery; import com.cyl.manager.pms.service.SkuService; -import com.cyl.manager.pms.pojo.vo.SkuVO; +import com.cyl.manager.pms.domain.vo.SkuVO; import com.ruoyi.common.utils.poi.ExcelUtil; /** * sku信息Controller diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/pms/convert/BrandConvert.java b/ruoyi-mall/src/main/java/com/cyl/manager/pms/convert/BrandConvert.java index 7d31c4c..a008cdd 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/pms/convert/BrandConvert.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/pms/convert/BrandConvert.java @@ -1,8 +1,8 @@ package com.cyl.manager.pms.convert; import org.mapstruct.Mapper; -import com.cyl.manager.pms.domain.Brand; -import com.cyl.manager.pms.pojo.vo.BrandVO; +import com.cyl.manager.pms.domain.entity.Brand; +import com.cyl.manager.pms.domain.vo.BrandVO; import java.util.List; /** * 品牌管理 DO <=> DTO <=> VO / BO / Query diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/pms/convert/ProductCategoryConvert.java b/ruoyi-mall/src/main/java/com/cyl/manager/pms/convert/ProductCategoryConvert.java index 0e04f73..8596da3 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/pms/convert/ProductCategoryConvert.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/pms/convert/ProductCategoryConvert.java @@ -1,9 +1,9 @@ package com.cyl.manager.pms.convert; -import com.cyl.h5.pojo.dto.CategoryDTO; +import com.cyl.h5.domain.dto.CategoryDTO; import org.mapstruct.Mapper; -import com.cyl.manager.pms.domain.ProductCategory; -import com.cyl.manager.pms.pojo.vo.ProductCategoryVO; +import com.cyl.manager.pms.domain.entity.ProductCategory; +import com.cyl.manager.pms.domain.vo.ProductCategoryVO; import java.util.List; /** * 商品分类 DO <=> DTO <=> VO / BO / Query diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/pms/convert/ProductConvert.java b/ruoyi-mall/src/main/java/com/cyl/manager/pms/convert/ProductConvert.java index 0650167..56dd3d7 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/pms/convert/ProductConvert.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/pms/convert/ProductConvert.java @@ -1,9 +1,10 @@ package com.cyl.manager.pms.convert; -import com.cyl.h5.pojo.dto.ProductDTO; +import com.cyl.h5.domain.vo.H5ProductVO; +import com.cyl.manager.pms.domain.entity.Product; +import com.cyl.manager.pms.domain.vo.ProductVO; import org.mapstruct.Mapper; -import com.cyl.manager.pms.domain.Product; -import com.cyl.manager.pms.pojo.vo.ProductVO; + import java.util.List; /** * 商品信息 DO <=> DTO <=> VO / BO / Query @@ -17,5 +18,5 @@ public interface ProductConvert { Product vo2do(ProductVO productVO); ProductVO do2vo(Product product); - List dos2dtos(List products); + List dos2dtos(List products); } diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/pms/convert/SkuConvert.java b/ruoyi-mall/src/main/java/com/cyl/manager/pms/convert/SkuConvert.java index b2c5104..399c5ac 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/pms/convert/SkuConvert.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/pms/convert/SkuConvert.java @@ -1,8 +1,8 @@ package com.cyl.manager.pms.convert; import org.mapstruct.Mapper; -import com.cyl.manager.pms.domain.Sku; -import com.cyl.manager.pms.pojo.vo.SkuVO; +import com.cyl.manager.pms.domain.entity.Sku; +import com.cyl.manager.pms.domain.vo.SkuVO; import java.util.List; /** * sku信息 DO <=> DTO <=> VO / BO / Query diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/pms/domain/Brand.java b/ruoyi-mall/src/main/java/com/cyl/manager/pms/domain/entity/Brand.java similarity index 95% rename from ruoyi-mall/src/main/java/com/cyl/manager/pms/domain/Brand.java rename to ruoyi-mall/src/main/java/com/cyl/manager/pms/domain/entity/Brand.java index ce7a0dd..081689a 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/pms/domain/Brand.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/pms/domain/entity/Brand.java @@ -1,4 +1,4 @@ -package com.cyl.manager.pms.domain; +package com.cyl.manager.pms.domain.entity; import com.ruoyi.common.annotation.Excel; import io.swagger.annotations.ApiModel; diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/pms/domain/Product.java b/ruoyi-mall/src/main/java/com/cyl/manager/pms/domain/entity/Product.java similarity index 98% rename from ruoyi-mall/src/main/java/com/cyl/manager/pms/domain/Product.java rename to ruoyi-mall/src/main/java/com/cyl/manager/pms/domain/entity/Product.java index d3b8059..9af85a9 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/pms/domain/Product.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/pms/domain/entity/Product.java @@ -1,4 +1,4 @@ -package com.cyl.manager.pms.domain; +package com.cyl.manager.pms.domain.entity; import java.math.BigDecimal; import com.ruoyi.common.annotation.Excel; diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/pms/domain/ProductCategory.java b/ruoyi-mall/src/main/java/com/cyl/manager/pms/domain/entity/ProductCategory.java similarity index 96% rename from ruoyi-mall/src/main/java/com/cyl/manager/pms/domain/ProductCategory.java rename to ruoyi-mall/src/main/java/com/cyl/manager/pms/domain/entity/ProductCategory.java index 2efa4f1..4194a00 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/pms/domain/ProductCategory.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/pms/domain/entity/ProductCategory.java @@ -1,4 +1,4 @@ -package com.cyl.manager.pms.domain; +package com.cyl.manager.pms.domain.entity; import com.ruoyi.common.annotation.Excel; import io.swagger.annotations.ApiModel; diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/pms/domain/Sku.java b/ruoyi-mall/src/main/java/com/cyl/manager/pms/domain/entity/Sku.java similarity index 96% rename from ruoyi-mall/src/main/java/com/cyl/manager/pms/domain/Sku.java rename to ruoyi-mall/src/main/java/com/cyl/manager/pms/domain/entity/Sku.java index 0c552d5..a53608d 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/pms/domain/Sku.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/pms/domain/entity/Sku.java @@ -1,4 +1,4 @@ -package com.cyl.manager.pms.domain; +package com.cyl.manager.pms.domain.entity; import java.math.BigDecimal; import com.ruoyi.common.annotation.Excel; diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/pms/pojo/query/BrandQuery.java b/ruoyi-mall/src/main/java/com/cyl/manager/pms/domain/query/BrandQuery.java similarity index 92% rename from ruoyi-mall/src/main/java/com/cyl/manager/pms/pojo/query/BrandQuery.java rename to ruoyi-mall/src/main/java/com/cyl/manager/pms/domain/query/BrandQuery.java index 052559e..9a3172d 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/pms/pojo/query/BrandQuery.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/pms/domain/query/BrandQuery.java @@ -1,4 +1,4 @@ -package com.cyl.manager.pms.pojo.query; +package com.cyl.manager.pms.domain.query; import lombok.Data; import io.swagger.annotations.ApiModel; diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/pms/pojo/query/ProductCategoryQuery.java b/ruoyi-mall/src/main/java/com/cyl/manager/pms/domain/query/ProductCategoryQuery.java similarity index 94% rename from ruoyi-mall/src/main/java/com/cyl/manager/pms/pojo/query/ProductCategoryQuery.java rename to ruoyi-mall/src/main/java/com/cyl/manager/pms/domain/query/ProductCategoryQuery.java index df96e2a..64d0f59 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/pms/pojo/query/ProductCategoryQuery.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/pms/domain/query/ProductCategoryQuery.java @@ -1,4 +1,4 @@ -package com.cyl.manager.pms.pojo.query; +package com.cyl.manager.pms.domain.query; import lombok.Data; import io.swagger.annotations.ApiModel; diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/pms/pojo/query/ProductQuery.java b/ruoyi-mall/src/main/java/com/cyl/manager/pms/domain/query/ProductQuery.java similarity index 97% rename from ruoyi-mall/src/main/java/com/cyl/manager/pms/pojo/query/ProductQuery.java rename to ruoyi-mall/src/main/java/com/cyl/manager/pms/domain/query/ProductQuery.java index f3421cd..d294446 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/pms/pojo/query/ProductQuery.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/pms/domain/query/ProductQuery.java @@ -1,4 +1,4 @@ -package com.cyl.manager.pms.pojo.query; +package com.cyl.manager.pms.domain.query; import java.math.BigDecimal; diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/pms/pojo/query/SkuQuery.java b/ruoyi-mall/src/main/java/com/cyl/manager/pms/domain/query/SkuQuery.java similarity index 94% rename from ruoyi-mall/src/main/java/com/cyl/manager/pms/pojo/query/SkuQuery.java rename to ruoyi-mall/src/main/java/com/cyl/manager/pms/domain/query/SkuQuery.java index daa66a7..8f18b7b 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/pms/pojo/query/SkuQuery.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/pms/domain/query/SkuQuery.java @@ -1,4 +1,4 @@ -package com.cyl.manager.pms.pojo.query; +package com.cyl.manager.pms.domain.query; import java.math.BigDecimal; import lombok.Data; diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/pms/pojo/vo/BrandVO.java b/ruoyi-mall/src/main/java/com/cyl/manager/pms/domain/vo/BrandVO.java similarity index 93% rename from ruoyi-mall/src/main/java/com/cyl/manager/pms/pojo/vo/BrandVO.java rename to ruoyi-mall/src/main/java/com/cyl/manager/pms/domain/vo/BrandVO.java index 8c725be..9fe2dba 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/pms/pojo/vo/BrandVO.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/pms/domain/vo/BrandVO.java @@ -1,4 +1,4 @@ -package com.cyl.manager.pms.pojo.vo; +package com.cyl.manager.pms.domain.vo; import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.core.domain.BaseAudit; diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/pms/pojo/vo/ProductCategoryVO.java b/ruoyi-mall/src/main/java/com/cyl/manager/pms/domain/vo/ProductCategoryVO.java similarity index 94% rename from ruoyi-mall/src/main/java/com/cyl/manager/pms/pojo/vo/ProductCategoryVO.java rename to ruoyi-mall/src/main/java/com/cyl/manager/pms/domain/vo/ProductCategoryVO.java index 7cabdfa..20ac658 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/pms/pojo/vo/ProductCategoryVO.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/pms/domain/vo/ProductCategoryVO.java @@ -1,4 +1,4 @@ -package com.cyl.manager.pms.pojo.vo; +package com.cyl.manager.pms.domain.vo; import com.ruoyi.common.core.domain.BaseAudit; import lombok.Data; diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/pms/pojo/vo/ProductVO.java b/ruoyi-mall/src/main/java/com/cyl/manager/pms/domain/vo/ProductVO.java similarity index 95% rename from ruoyi-mall/src/main/java/com/cyl/manager/pms/pojo/vo/ProductVO.java rename to ruoyi-mall/src/main/java/com/cyl/manager/pms/domain/vo/ProductVO.java index 8a75f30..f2917f7 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/pms/pojo/vo/ProductVO.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/pms/domain/vo/ProductVO.java @@ -1,12 +1,12 @@ -package com.cyl.manager.pms.pojo.vo; +package com.cyl.manager.pms.domain.vo; -import java.math.BigDecimal; -import java.util.List; - -import com.cyl.manager.pms.domain.Sku; +import com.cyl.manager.pms.domain.entity.Sku; import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.core.domain.BaseAudit; import lombok.Data; + +import java.math.BigDecimal; +import java.util.List; /** * 商品信息 数据视图对象 * diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/pms/pojo/vo/SkuVO.java b/ruoyi-mall/src/main/java/com/cyl/manager/pms/domain/vo/SkuVO.java similarity index 95% rename from ruoyi-mall/src/main/java/com/cyl/manager/pms/pojo/vo/SkuVO.java rename to ruoyi-mall/src/main/java/com/cyl/manager/pms/domain/vo/SkuVO.java index 86d8a75..7749a86 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/pms/pojo/vo/SkuVO.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/pms/domain/vo/SkuVO.java @@ -1,4 +1,4 @@ -package com.cyl.manager.pms.pojo.vo; +package com.cyl.manager.pms.domain.vo; import java.math.BigDecimal; import com.ruoyi.common.annotation.Excel; diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/pms/mapper/BrandMapper.java b/ruoyi-mall/src/main/java/com/cyl/manager/pms/mapper/BrandMapper.java index 23fa853..42f1ed6 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/pms/mapper/BrandMapper.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/pms/mapper/BrandMapper.java @@ -2,7 +2,7 @@ package com.cyl.manager.pms.mapper; import java.util.List; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.cyl.manager.pms.domain.Brand; +import com.cyl.manager.pms.domain.entity.Brand; /** * 品牌管理Mapper接口 diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/pms/mapper/ProductCategoryMapper.java b/ruoyi-mall/src/main/java/com/cyl/manager/pms/mapper/ProductCategoryMapper.java index 8a6db5e..9586459 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/pms/mapper/ProductCategoryMapper.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/pms/mapper/ProductCategoryMapper.java @@ -2,7 +2,7 @@ package com.cyl.manager.pms.mapper; import java.util.List; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.cyl.manager.pms.domain.ProductCategory; +import com.cyl.manager.pms.domain.entity.ProductCategory; /** * 商品分类Mapper接口 diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/pms/mapper/ProductMapper.java b/ruoyi-mall/src/main/java/com/cyl/manager/pms/mapper/ProductMapper.java index 44d9a64..f13b3d7 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/pms/mapper/ProductMapper.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/pms/mapper/ProductMapper.java @@ -1,8 +1,9 @@ package com.cyl.manager.pms.mapper; -import java.util.List; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.cyl.manager.pms.domain.Product; +import com.cyl.manager.pms.domain.entity.Product; + +import java.util.List; /** * 商品信息Mapper接口 diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/pms/mapper/SkuMapper.java b/ruoyi-mall/src/main/java/com/cyl/manager/pms/mapper/SkuMapper.java index e2cd36c..a4876d5 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/pms/mapper/SkuMapper.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/pms/mapper/SkuMapper.java @@ -3,7 +3,7 @@ package com.cyl.manager.pms.mapper; import java.time.LocalDateTime; import java.util.List; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.cyl.manager.pms.domain.Sku; +import com.cyl.manager.pms.domain.entity.Sku; import org.apache.ibatis.annotations.Param; /** diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/pms/service/BrandService.java b/ruoyi-mall/src/main/java/com/cyl/manager/pms/service/BrandService.java index d60217d..849cd61 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/pms/service/BrandService.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/pms/service/BrandService.java @@ -9,8 +9,8 @@ import org.springframework.data.domain.Pageable; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import com.cyl.manager.pms.mapper.BrandMapper; -import com.cyl.manager.pms.domain.Brand; -import com.cyl.manager.pms.pojo.query.BrandQuery; +import com.cyl.manager.pms.domain.entity.Brand; +import com.cyl.manager.pms.domain.query.BrandQuery; /** * 品牌管理Service业务层处理 diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/pms/service/ProductCategoryService.java b/ruoyi-mall/src/main/java/com/cyl/manager/pms/service/ProductCategoryService.java index 6a5d6d9..ff03bee 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/pms/service/ProductCategoryService.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/pms/service/ProductCategoryService.java @@ -5,15 +5,15 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.OrderItem; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.cyl.h5.pojo.dto.CategoryDTO; +import com.cyl.h5.domain.dto.CategoryDTO; import com.cyl.manager.pms.convert.ProductCategoryConvert; import com.cyl.manager.pms.convert.ProductConvert; -import com.cyl.manager.pms.domain.Product; -import com.cyl.manager.pms.domain.ProductCategory; +import com.cyl.manager.pms.domain.entity.Product; +import com.cyl.manager.pms.domain.entity.ProductCategory; import com.cyl.manager.pms.mapper.ProductCategoryMapper; import com.cyl.manager.pms.mapper.ProductMapper; -import com.cyl.manager.pms.pojo.query.ProductCategoryQuery; -import com.cyl.manager.pms.pojo.vo.ProductCategoryVO; +import com.cyl.manager.pms.domain.query.ProductCategoryQuery; +import com.cyl.manager.pms.domain.vo.ProductCategoryVO; import com.github.pagehelper.PageHelper; import com.ruoyi.common.exception.base.BaseException; import org.apache.commons.lang3.StringUtils; diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/pms/service/ProductService.java b/ruoyi-mall/src/main/java/com/cyl/manager/pms/service/ProductService.java index e2e3743..4daa35c 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/pms/service/ProductService.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/pms/service/ProductService.java @@ -8,12 +8,12 @@ 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.pojo.vo.ProductDetail; +import com.cyl.h5.domain.vo.ProductDetail; import com.cyl.manager.pms.convert.ProductConvert; -import com.cyl.manager.pms.domain.Sku; +import com.cyl.manager.pms.domain.entity.Sku; import com.cyl.manager.pms.mapper.BrandMapper; import com.cyl.manager.pms.mapper.SkuMapper; -import com.cyl.manager.pms.pojo.vo.ProductVO; +import com.cyl.manager.pms.domain.vo.ProductVO; import com.github.pagehelper.PageHelper; import com.ruoyi.common.utils.SecurityUtils; import lombok.extern.slf4j.Slf4j; @@ -22,8 +22,8 @@ import org.springframework.data.domain.Pageable; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import com.cyl.manager.pms.mapper.ProductMapper; -import com.cyl.manager.pms.domain.Product; -import com.cyl.manager.pms.pojo.query.ProductQuery; +import com.cyl.manager.pms.domain.entity.Product; +import com.cyl.manager.pms.domain.query.ProductQuery; import org.springframework.transaction.annotation.Transactional; /** diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/pms/service/SkuService.java b/ruoyi-mall/src/main/java/com/cyl/manager/pms/service/SkuService.java index 8a38e9f..f6baed1 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/pms/service/SkuService.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/pms/service/SkuService.java @@ -10,8 +10,8 @@ import org.springframework.data.domain.Pageable; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import com.cyl.manager.pms.mapper.SkuMapper; -import com.cyl.manager.pms.domain.Sku; -import com.cyl.manager.pms.pojo.query.SkuQuery; +import com.cyl.manager.pms.domain.entity.Sku; +import com.cyl.manager.pms.domain.query.SkuQuery; /** * sku信息Service业务层处理 diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/statistics/controller/IndexStatisticsManagerController.java b/ruoyi-mall/src/main/java/com/cyl/manager/statistics/controller/IndexStatisticsManagerController.java index 16ebd31..c57d12a 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/statistics/controller/IndexStatisticsManagerController.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/statistics/controller/IndexStatisticsManagerController.java @@ -1,14 +1,13 @@ package com.cyl.manager.statistics.controller; -import com.cyl.manager.statistics.pojo.GoodsStatisticsQueryParam; -import com.cyl.manager.statistics.pojo.OrderStatisticsQueryParam; -import com.cyl.manager.statistics.pojo.vo.MemberAndCartStatisticsVO; -import com.cyl.manager.statistics.pojo.vo.OrderAndAftersaleStatisticsVO; -import com.cyl.manager.statistics.pojo.vo.OrderStatisticsVO; -import com.cyl.manager.statistics.pojo.vo.ProductTopVO; +import com.cyl.manager.statistics.domain.query.GoodsStatisticsQuery; +import com.cyl.manager.statistics.domain.query.OrderStatisticsQuery; +import com.cyl.manager.statistics.domain.vo.MemberAndCartStatisticsVO; +import com.cyl.manager.statistics.domain.vo.OrderAndAftersaleStatisticsVO; +import com.cyl.manager.statistics.domain.vo.OrderStatisticsVO; +import com.cyl.manager.statistics.domain.vo.ProductTopVO; import com.cyl.manager.statistics.service.IndexStatisticsService; -import com.ruoyi.common.core.domain.AjaxResult; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; @@ -39,14 +38,14 @@ public class IndexStatisticsManagerController { @ApiOperation(value = "获取首页查询热卖商品TOP10") @GetMapping("/goodsStatistics") - public ResponseEntity> goodsStatistics(@Validated GoodsStatisticsQueryParam goodsStatisticsQueryParam) { + public ResponseEntity> goodsStatistics(@Validated GoodsStatisticsQuery goodsStatisticsQuery) { - return ResponseEntity.ok(indexStatisticsService.goodsStatistics(goodsStatisticsQueryParam)); + return ResponseEntity.ok(indexStatisticsService.goodsStatistics(goodsStatisticsQuery)); } @ApiOperation(value = "订单信息") @PostMapping("/orderStatistics") - public ResponseEntity> orderStatistics(@RequestBody OrderStatisticsQueryParam param) { + public ResponseEntity> orderStatistics(@RequestBody OrderStatisticsQuery param) { return ResponseEntity.ok(indexStatisticsService.orderStatistics(param)); } diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/statistics/pojo/GoodsStatisticsQueryParam.java b/ruoyi-mall/src/main/java/com/cyl/manager/statistics/domain/query/GoodsStatisticsQuery.java similarity index 86% rename from ruoyi-mall/src/main/java/com/cyl/manager/statistics/pojo/GoodsStatisticsQueryParam.java rename to ruoyi-mall/src/main/java/com/cyl/manager/statistics/domain/query/GoodsStatisticsQuery.java index dfe861c..644c9bb 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/statistics/pojo/GoodsStatisticsQueryParam.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/statistics/domain/query/GoodsStatisticsQuery.java @@ -1,4 +1,4 @@ -package com.cyl.manager.statistics.pojo; +package com.cyl.manager.statistics.domain.query; import lombok.Data; @@ -12,7 +12,7 @@ import javax.validation.constraints.NotNull; * @since 2023/05/15 13:53 */ @Data -public class GoodsStatisticsQueryParam { +public class GoodsStatisticsQuery { @NotNull(message = "统计类型 1：商品规格排行 2：商品排行") private Integer statType; @NotNull(message = "参数size不能为空") diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/statistics/pojo/OrderStatisticsQueryParam.java b/ruoyi-mall/src/main/java/com/cyl/manager/statistics/domain/query/OrderStatisticsQuery.java similarity index 75% rename from ruoyi-mall/src/main/java/com/cyl/manager/statistics/pojo/OrderStatisticsQueryParam.java rename to ruoyi-mall/src/main/java/com/cyl/manager/statistics/domain/query/OrderStatisticsQuery.java index 97044ce..e093ac3 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/statistics/pojo/OrderStatisticsQueryParam.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/statistics/domain/query/OrderStatisticsQuery.java @@ -1,4 +1,4 @@ -package com.cyl.manager.statistics.pojo; +package com.cyl.manager.statistics.domain.query; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -6,7 +6,7 @@ import lombok.Data; @ApiModel("订单统计查询条件对象") @Data -public class OrderStatisticsQueryParam { +public class OrderStatisticsQuery { @ApiModelProperty("查询范围类型 1：近一周 2：近一个月") private Integer type; diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/statistics/pojo/vo/MemberAndCartStatisticsVO.java b/ruoyi-mall/src/main/java/com/cyl/manager/statistics/domain/vo/MemberAndCartStatisticsVO.java similarity index 74% rename from ruoyi-mall/src/main/java/com/cyl/manager/statistics/pojo/vo/MemberAndCartStatisticsVO.java rename to ruoyi-mall/src/main/java/com/cyl/manager/statistics/domain/vo/MemberAndCartStatisticsVO.java index d89dee7..f1a20e2 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/statistics/pojo/vo/MemberAndCartStatisticsVO.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/statistics/domain/vo/MemberAndCartStatisticsVO.java @@ -1,4 +1,4 @@ -package com.cyl.manager.statistics.pojo.vo; +package com.cyl.manager.statistics.domain.vo; import lombok.Data; diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/statistics/pojo/vo/OrderAndAftersaleStatisticsVO.java b/ruoyi-mall/src/main/java/com/cyl/manager/statistics/domain/vo/OrderAndAftersaleStatisticsVO.java similarity index 91% rename from ruoyi-mall/src/main/java/com/cyl/manager/statistics/pojo/vo/OrderAndAftersaleStatisticsVO.java rename to ruoyi-mall/src/main/java/com/cyl/manager/statistics/domain/vo/OrderAndAftersaleStatisticsVO.java index aee51c8..c4894bd 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/statistics/pojo/vo/OrderAndAftersaleStatisticsVO.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/statistics/domain/vo/OrderAndAftersaleStatisticsVO.java @@ -1,4 +1,4 @@ -package com.cyl.manager.statistics.pojo.vo; +package com.cyl.manager.statistics.domain.vo; import lombok.Data; diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/statistics/pojo/vo/OrderStatisticsVO.java b/ruoyi-mall/src/main/java/com/cyl/manager/statistics/domain/vo/OrderStatisticsVO.java similarity index 86% rename from ruoyi-mall/src/main/java/com/cyl/manager/statistics/pojo/vo/OrderStatisticsVO.java rename to ruoyi-mall/src/main/java/com/cyl/manager/statistics/domain/vo/OrderStatisticsVO.java index e46b88d..7897846 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/statistics/pojo/vo/OrderStatisticsVO.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/statistics/domain/vo/OrderStatisticsVO.java @@ -1,4 +1,4 @@ -package com.cyl.manager.statistics.pojo.vo; +package com.cyl.manager.statistics.domain.vo; import lombok.Data; diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/statistics/pojo/vo/ProductTopVO.java b/ruoyi-mall/src/main/java/com/cyl/manager/statistics/domain/vo/ProductTopVO.java similarity index 78% rename from ruoyi-mall/src/main/java/com/cyl/manager/statistics/pojo/vo/ProductTopVO.java rename to ruoyi-mall/src/main/java/com/cyl/manager/statistics/domain/vo/ProductTopVO.java index 3b9acde..0197650 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/statistics/pojo/vo/ProductTopVO.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/statistics/domain/vo/ProductTopVO.java @@ -1,4 +1,4 @@ -package com.cyl.manager.statistics.pojo.vo; +package com.cyl.manager.statistics.domain.vo; import lombok.Data; diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/statistics/mapper/IndexStatisticsMapper.java b/ruoyi-mall/src/main/java/com/cyl/manager/statistics/mapper/IndexStatisticsMapper.java index e995b49..a8e143c 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/statistics/mapper/IndexStatisticsMapper.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/statistics/mapper/IndexStatisticsMapper.java @@ -1,17 +1,17 @@ package com.cyl.manager.statistics.mapper; -import com.cyl.manager.statistics.pojo.GoodsStatisticsQueryParam; -import com.cyl.manager.statistics.pojo.OrderStatisticsQueryParam; -import com.cyl.manager.statistics.pojo.vo.OrderStatisticsVO; -import com.cyl.manager.statistics.pojo.vo.ProductTopVO; +import com.cyl.manager.statistics.domain.query.GoodsStatisticsQuery; +import com.cyl.manager.statistics.domain.query.OrderStatisticsQuery; +import com.cyl.manager.statistics.domain.vo.OrderStatisticsVO; +import com.cyl.manager.statistics.domain.vo.ProductTopVO; import java.util.List; public interface IndexStatisticsMapper { - List goodsSkuStatistics(GoodsStatisticsQueryParam goodsStatisticsQueryParam); + List goodsSkuStatistics(GoodsStatisticsQuery goodsStatisticsQuery); - List goodsStatistics(GoodsStatisticsQueryParam goodsStatisticsQueryParam); - List orderStatistics(OrderStatisticsQueryParam param); + List goodsStatistics(GoodsStatisticsQuery goodsStatisticsQuery); + List orderStatistics(OrderStatisticsQuery param); } diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/statistics/service/IndexStatisticsService.java b/ruoyi-mall/src/main/java/com/cyl/manager/statistics/service/IndexStatisticsService.java index 93017d6..fed8136 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/statistics/service/IndexStatisticsService.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/statistics/service/IndexStatisticsService.java @@ -2,19 +2,15 @@ package com.cyl.manager.statistics.service; import com.cyl.manager.oms.mapper.AftersaleMapper; import com.cyl.manager.oms.mapper.OrderMapper; -import com.cyl.manager.oms.service.AftersaleService; -import com.cyl.manager.oms.service.OrderDeliveryHistoryService; -import com.cyl.manager.oms.service.OrderService; import com.cyl.manager.statistics.mapper.IndexStatisticsMapper; -import com.cyl.manager.statistics.pojo.GoodsStatisticsQueryParam; -import com.cyl.manager.statistics.pojo.OrderStatisticsQueryParam; -import com.cyl.manager.statistics.pojo.vo.MemberAndCartStatisticsVO; -import com.cyl.manager.statistics.pojo.vo.OrderAndAftersaleStatisticsVO; -import com.cyl.manager.statistics.pojo.vo.OrderStatisticsVO; -import com.cyl.manager.statistics.pojo.vo.ProductTopVO; +import com.cyl.manager.statistics.domain.query.GoodsStatisticsQuery; +import com.cyl.manager.statistics.domain.query.OrderStatisticsQuery; +import com.cyl.manager.statistics.domain.vo.MemberAndCartStatisticsVO; +import com.cyl.manager.statistics.domain.vo.OrderAndAftersaleStatisticsVO; +import com.cyl.manager.statistics.domain.vo.OrderStatisticsVO; +import com.cyl.manager.statistics.domain.vo.ProductTopVO; import com.cyl.manager.ums.mapper.MemberCartMapper; import com.cyl.manager.ums.mapper.MemberMapper; -import com.cyl.manager.ums.service.MemberService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -22,7 +18,6 @@ import java.time.LocalDate; import java.time.LocalDateTime; import java.time.LocalTime; import java.util.List; -import java.util.Objects; /** * 管理端,首页统计数据Service业务层处理 @@ -44,15 +39,15 @@ public class IndexStatisticsService { private OrderMapper orderMapper; - public List goodsStatistics(GoodsStatisticsQueryParam goodsStatisticsQueryParam) { - if (goodsStatisticsQueryParam.getStatType() == 1){ - return indexStatisticsMapper.goodsSkuStatistics(goodsStatisticsQueryParam); + public List goodsStatistics(GoodsStatisticsQuery goodsStatisticsQuery) { + if (goodsStatisticsQuery.getStatType() == 1){ + return indexStatisticsMapper.goodsSkuStatistics(goodsStatisticsQuery); }else { - return indexStatisticsMapper.goodsStatistics(goodsStatisticsQueryParam); + return indexStatisticsMapper.goodsStatistics(goodsStatisticsQuery); } } - public List orderStatistics(OrderStatisticsQueryParam param) { + public List orderStatistics(OrderStatisticsQuery param) { return indexStatisticsMapper.orderStatistics(param); } diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/ums/controller/FeedbackController.java b/ruoyi-mall/src/main/java/com/cyl/manager/ums/controller/FeedbackController.java index 0bf9026..2bf1033 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/ums/controller/FeedbackController.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/ums/controller/FeedbackController.java @@ -2,8 +2,6 @@ package com.cyl.manager.ums.controller; import java.util.List; -import com.cyl.manager.ums.domain.Member; -import com.cyl.manager.ums.pojo.dto.ChangeMemberStatusDTO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.data.domain.PageImpl; @@ -12,9 +10,7 @@ import org.springframework.data.domain.Page; import org.springframework.http.ResponseEntity; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestBody; @@ -24,11 +20,10 @@ import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.enums.BusinessType; import com.cyl.manager.ums.convert.FeedbackConvert; -import com.cyl.manager.ums.domain.Feedback; -import com.cyl.manager.ums.pojo.query.FeedbackQuery; +import com.cyl.manager.ums.domain.entity.Feedback; +import com.cyl.manager.ums.domain.query.FeedbackQuery; import com.cyl.manager.ums.service.FeedbackService; -import com.cyl.manager.ums.pojo.vo.FeedbackVO; -import com.ruoyi.common.utils.poi.ExcelUtil; + /** * 意见反馈Controller * diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/ums/controller/MemberAccountController.java b/ruoyi-mall/src/main/java/com/cyl/manager/ums/controller/MemberAccountController.java index bd0f05f..9847af7 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/ums/controller/MemberAccountController.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/ums/controller/MemberAccountController.java @@ -22,10 +22,10 @@ import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.enums.BusinessType; import com.cyl.manager.ums.convert.MemberAccountConvert; -import com.cyl.manager.ums.domain.MemberAccount; -import com.cyl.manager.ums.pojo.query.MemberAccountQuery; +import com.cyl.manager.ums.domain.entity.MemberAccount; +import com.cyl.manager.ums.domain.query.MemberAccountQuery; import com.cyl.manager.ums.service.MemberAccountService; -import com.cyl.manager.ums.pojo.vo.MemberAccountVO; +import com.cyl.manager.ums.domain.vo.MemberAccountVO; import com.ruoyi.common.utils.poi.ExcelUtil; /** * 会员账户表Controller diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/ums/controller/MemberAddressController.java b/ruoyi-mall/src/main/java/com/cyl/manager/ums/controller/MemberAddressController.java index fc40518..5c5bc64 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/ums/controller/MemberAddressController.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/ums/controller/MemberAddressController.java @@ -22,10 +22,10 @@ import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.enums.BusinessType; import com.cyl.manager.ums.convert.MemberAddressConvert; -import com.cyl.manager.ums.domain.MemberAddress; -import com.cyl.manager.ums.pojo.query.MemberAddressQuery; +import com.cyl.manager.ums.domain.entity.MemberAddress; +import com.cyl.manager.ums.domain.query.MemberAddressQuery; import com.cyl.manager.ums.service.MemberAddressService; -import com.cyl.manager.ums.pojo.vo.MemberAddressVO; +import com.cyl.manager.ums.domain.vo.MemberAddressVO; /** * 会员收货地址Controller diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/ums/controller/MemberCartController.java b/ruoyi-mall/src/main/java/com/cyl/manager/ums/controller/MemberCartController.java index e176fde..ee218ee 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/ums/controller/MemberCartController.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/ums/controller/MemberCartController.java @@ -1,11 +1,10 @@ package com.cyl.manager.ums.controller; -import com.cyl.manager.ums.pojo.vo.MemberCartVO; +import com.cyl.manager.ums.domain.vo.MemberCartVO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.data.domain.PageImpl; import org.springframework.data.domain.Pageable; -import org.springframework.data.domain.Page; import org.springframework.http.ResponseEntity; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; @@ -21,12 +20,10 @@ import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.enums.BusinessType; import com.cyl.manager.ums.convert.MemberCartConvert; -import com.cyl.manager.ums.domain.MemberCart; -import com.cyl.manager.ums.pojo.query.MemberCartQuery; +import com.cyl.manager.ums.domain.entity.MemberCart; +import com.cyl.manager.ums.domain.query.MemberCartQuery; import com.cyl.manager.ums.service.MemberCartService; -import java.util.List; - /** * 购物车Controller * diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/ums/controller/MemberController.java b/ruoyi-mall/src/main/java/com/cyl/manager/ums/controller/MemberController.java index 6348828..84711b1 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/ums/controller/MemberController.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/ums/controller/MemberController.java @@ -1,27 +1,27 @@ package com.cyl.manager.ums.controller; -import java.util.List; - -import com.cyl.manager.ums.pojo.dto.ChangeMemberStatusDTO; -import com.cyl.manager.ums.pojo.vo.MemberDataStatisticsVO; +import com.cyl.manager.ums.convert.MemberConvert; +import com.cyl.manager.ums.domain.form.ChangeMemberStatusForm; +import com.cyl.manager.ums.domain.entity.Member; +import com.cyl.manager.ums.domain.query.MemberQuery; +import com.cyl.manager.ums.domain.vo.MemberDataStatisticsVO; +import com.cyl.manager.ums.domain.vo.MemberVO; +import com.cyl.manager.ums.service.MemberService; +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.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.Pageable; -import org.springframework.data.domain.Page; import org.springframework.http.ResponseEntity; import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.enums.BusinessType; -import com.cyl.manager.ums.convert.MemberConvert; -import com.cyl.manager.ums.domain.Member; -import com.cyl.manager.ums.pojo.query.MemberQuery; -import com.cyl.manager.ums.service.MemberService; -import com.cyl.manager.ums.pojo.vo.MemberVO; -import com.ruoyi.common.utils.poi.ExcelUtil; + +import java.util.List; /** * 会员信息Controller * @@ -97,8 +97,8 @@ public class MemberController extends BaseController { @ApiOperation(("修改会员账户状态")) @Log(title = "会员信息", businessType = BusinessType.UPDATE) @PostMapping("/status/change") - public ResponseEntity changeStatus(@RequestBody ChangeMemberStatusDTO dto){ - return ResponseEntity.ok(service.changeStatus(dto)); + public ResponseEntity changeStatus(@RequestBody ChangeMemberStatusForm form){ + return ResponseEntity.ok(service.changeStatus(form)); } @ApiOperation("会员手机号解密") diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/ums/controller/MemberLogininforController.java b/ruoyi-mall/src/main/java/com/cyl/manager/ums/controller/MemberLogininforController.java index d043355..a5a5c12 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/ums/controller/MemberLogininforController.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/ums/controller/MemberLogininforController.java @@ -1,41 +1,26 @@ package com.cyl.manager.ums.controller; -import java.util.List; - -import com.cyl.h5.config.SecurityUtil; -import com.cyl.manager.ums.domain.Member; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.core.domain.model.LoginMember; -import com.ruoyi.common.utils.SecurityUtils; -import com.ruoyi.framework.config.LocalDataUtil; +import com.cyl.manager.ums.convert.MemberLogininforConvert; +import com.cyl.manager.ums.domain.entity.MemberLogininfor; +import com.cyl.manager.ums.domain.query.MemberLogininforQuery; +import com.cyl.manager.ums.domain.vo.MemberLogininforVO; +import com.cyl.manager.ums.service.MemberLogininforService; +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 com.ruoyi.framework.web.service.TokenService; import io.swagger.annotations.Api; 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.Pageable; -import org.springframework.data.domain.Page; import org.springframework.http.ResponseEntity; import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.enums.BusinessType; -import com.cyl.manager.ums.convert.MemberLogininforConvert; -import com.cyl.manager.ums.domain.MemberLogininfor; -import com.cyl.manager.ums.pojo.query.MemberLogininforQuery; -import com.cyl.manager.ums.service.MemberLogininforService; -import com.cyl.manager.ums.pojo.vo.MemberLogininforVO; -import com.ruoyi.common.utils.poi.ExcelUtil; +import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletRequest; +import java.util.List; /** * 会员登录记录Controller diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/ums/controller/MemberWechatController.java b/ruoyi-mall/src/main/java/com/cyl/manager/ums/controller/MemberWechatController.java index 5df331a..49a6d15 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/ums/controller/MemberWechatController.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/ums/controller/MemberWechatController.java @@ -22,10 +22,10 @@ import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.enums.BusinessType; import com.cyl.manager.ums.convert.MemberWechatConvert; -import com.cyl.manager.ums.domain.MemberWechat; -import com.cyl.manager.ums.pojo.query.MemberWechatQuery; +import com.cyl.manager.ums.domain.entity.MemberWechat; +import com.cyl.manager.ums.domain.query.MemberWechatQuery; import com.cyl.manager.ums.service.MemberWechatService; -import com.cyl.manager.ums.pojo.vo.MemberWechatVO; +import com.cyl.manager.ums.domain.vo.MemberWechatVO; import com.ruoyi.common.utils.poi.ExcelUtil; /** * 用户微信信息Controller diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/ums/convert/FeedbackConvert.java b/ruoyi-mall/src/main/java/com/cyl/manager/ums/convert/FeedbackConvert.java index fed5f5b..9cb6c51 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/ums/convert/FeedbackConvert.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/ums/convert/FeedbackConvert.java @@ -1,8 +1,8 @@ package com.cyl.manager.ums.convert; import org.mapstruct.Mapper; -import com.cyl.manager.ums.domain.Feedback; -import com.cyl.manager.ums.pojo.vo.FeedbackVO; +import com.cyl.manager.ums.domain.entity.Feedback; +import com.cyl.manager.ums.domain.vo.FeedbackVO; import java.util.List; /** * 意见反馈 DO <=> VO / BO diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/ums/convert/MemberAccountConvert.java b/ruoyi-mall/src/main/java/com/cyl/manager/ums/convert/MemberAccountConvert.java index e1ad886..09da385 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/ums/convert/MemberAccountConvert.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/ums/convert/MemberAccountConvert.java @@ -1,8 +1,8 @@ package com.cyl.manager.ums.convert; import org.mapstruct.Mapper; -import com.cyl.manager.ums.domain.MemberAccount; -import com.cyl.manager.ums.pojo.vo.MemberAccountVO; +import com.cyl.manager.ums.domain.entity.MemberAccount; +import com.cyl.manager.ums.domain.vo.MemberAccountVO; import java.util.List; /** * 会员账户表 DO <=> DTO <=> VO / BO / Query diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/ums/convert/MemberAddressConvert.java b/ruoyi-mall/src/main/java/com/cyl/manager/ums/convert/MemberAddressConvert.java index 344215a..0f346c1 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/ums/convert/MemberAddressConvert.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/ums/convert/MemberAddressConvert.java @@ -1,8 +1,8 @@ package com.cyl.manager.ums.convert; import org.mapstruct.Mapper; -import com.cyl.manager.ums.domain.MemberAddress; -import com.cyl.manager.ums.pojo.vo.MemberAddressVO; +import com.cyl.manager.ums.domain.entity.MemberAddress; +import com.cyl.manager.ums.domain.vo.MemberAddressVO; import java.util.List; /** * 会员收货地址 DO <=> DTO <=> VO / BO / Query diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/ums/convert/MemberCartConvert.java b/ruoyi-mall/src/main/java/com/cyl/manager/ums/convert/MemberCartConvert.java index 0019768..5480ac9 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/ums/convert/MemberCartConvert.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/ums/convert/MemberCartConvert.java @@ -1,11 +1,11 @@ package com.cyl.manager.ums.convert; -import com.cyl.manager.pms.domain.Product; -import com.cyl.manager.pms.domain.Sku; +import com.cyl.manager.pms.domain.entity.Product; +import com.cyl.manager.pms.domain.entity.Sku; import org.mapstruct.BeanMapping; import org.mapstruct.Mapper; -import com.cyl.manager.ums.domain.MemberCart; -import com.cyl.manager.ums.pojo.vo.MemberCartVO; +import com.cyl.manager.ums.domain.entity.MemberCart; +import com.cyl.manager.ums.domain.vo.MemberCartVO; import org.mapstruct.Mapping; import org.mapstruct.MappingTarget; diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/ums/convert/MemberConvert.java b/ruoyi-mall/src/main/java/com/cyl/manager/ums/convert/MemberConvert.java index 9a89d4e..70a6e38 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/ums/convert/MemberConvert.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/ums/convert/MemberConvert.java @@ -1,8 +1,8 @@ package com.cyl.manager.ums.convert; import org.mapstruct.Mapper; -import com.cyl.manager.ums.domain.Member; -import com.cyl.manager.ums.pojo.vo.MemberVO; +import com.cyl.manager.ums.domain.entity.Member; +import com.cyl.manager.ums.domain.vo.MemberVO; import java.util.List; /** * 会员信息 DO <=> DTO <=> VO / BO / Query diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/ums/convert/MemberLogininforConvert.java b/ruoyi-mall/src/main/java/com/cyl/manager/ums/convert/MemberLogininforConvert.java index b395d6f..435b288 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/ums/convert/MemberLogininforConvert.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/ums/convert/MemberLogininforConvert.java @@ -1,8 +1,8 @@ package com.cyl.manager.ums.convert; import org.mapstruct.Mapper; -import com.cyl.manager.ums.domain.MemberLogininfor; -import com.cyl.manager.ums.pojo.vo.MemberLogininforVO; +import com.cyl.manager.ums.domain.entity.MemberLogininfor; +import com.cyl.manager.ums.domain.vo.MemberLogininforVO; import java.util.List; /** * 会员登录记录 DO <=> DTO <=> VO / BO / Query diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/ums/convert/MemberWechatConvert.java b/ruoyi-mall/src/main/java/com/cyl/manager/ums/convert/MemberWechatConvert.java index a1db14b..6bb63f7 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/ums/convert/MemberWechatConvert.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/ums/convert/MemberWechatConvert.java @@ -2,8 +2,8 @@ package com.cyl.manager.ums.convert; import com.cyl.external.resp.AccessTokenResp; import org.mapstruct.Mapper; -import com.cyl.manager.ums.domain.MemberWechat; -import com.cyl.manager.ums.pojo.vo.MemberWechatVO; +import com.cyl.manager.ums.domain.entity.MemberWechat; +import com.cyl.manager.ums.domain.vo.MemberWechatVO; import java.util.List; /** * 用户微信信息 DO <=> DTO <=> VO / BO / Query diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/ums/pojo/dto/AddressDTO.java b/ruoyi-mall/src/main/java/com/cyl/manager/ums/domain/dto/AddressDTO.java similarity index 87% rename from ruoyi-mall/src/main/java/com/cyl/manager/ums/pojo/dto/AddressDTO.java rename to ruoyi-mall/src/main/java/com/cyl/manager/ums/domain/dto/AddressDTO.java index 97a62dc..426cbc5 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/ums/pojo/dto/AddressDTO.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/ums/domain/dto/AddressDTO.java @@ -1,4 +1,4 @@ -package com.cyl.manager.ums.pojo.dto; +package com.cyl.manager.ums.domain.dto; import lombok.Data; diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/ums/domain/Address.java b/ruoyi-mall/src/main/java/com/cyl/manager/ums/domain/entity/Address.java similarity index 96% rename from ruoyi-mall/src/main/java/com/cyl/manager/ums/domain/Address.java rename to ruoyi-mall/src/main/java/com/cyl/manager/ums/domain/entity/Address.java index 3e955b3..d9de717 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/ums/domain/Address.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/ums/domain/entity/Address.java @@ -1,4 +1,4 @@ -package com.cyl.manager.ums.domain; +package com.cyl.manager.ums.domain.entity; import com.baomidou.mybatisplus.annotation.TableName; import com.ruoyi.common.annotation.Excel; diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/ums/domain/Feedback.java b/ruoyi-mall/src/main/java/com/cyl/manager/ums/domain/entity/Feedback.java similarity index 97% rename from ruoyi-mall/src/main/java/com/cyl/manager/ums/domain/Feedback.java rename to ruoyi-mall/src/main/java/com/cyl/manager/ums/domain/entity/Feedback.java index 243e741..6b8f724 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/ums/domain/Feedback.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/ums/domain/entity/Feedback.java @@ -1,4 +1,4 @@ -package com.cyl.manager.ums.domain; +package com.cyl.manager.ums.domain.entity; import java.time.LocalDateTime; import com.ruoyi.common.annotation.Excel; diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/ums/domain/Member.java b/ruoyi-mall/src/main/java/com/cyl/manager/ums/domain/entity/Member.java similarity index 98% rename from ruoyi-mall/src/main/java/com/cyl/manager/ums/domain/Member.java rename to ruoyi-mall/src/main/java/com/cyl/manager/ums/domain/entity/Member.java index ca16e17..9084da6 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/ums/domain/Member.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/ums/domain/entity/Member.java @@ -1,4 +1,4 @@ -package com.cyl.manager.ums.domain; +package com.cyl.manager.ums.domain.entity; import java.math.BigDecimal; import java.time.LocalDate; diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/ums/domain/MemberAccount.java b/ruoyi-mall/src/main/java/com/cyl/manager/ums/domain/entity/MemberAccount.java similarity index 96% rename from ruoyi-mall/src/main/java/com/cyl/manager/ums/domain/MemberAccount.java rename to ruoyi-mall/src/main/java/com/cyl/manager/ums/domain/entity/MemberAccount.java index 36bc614..d7c0b99 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/ums/domain/MemberAccount.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/ums/domain/entity/MemberAccount.java @@ -1,4 +1,4 @@ -package com.cyl.manager.ums.domain; +package com.cyl.manager.ums.domain.entity; import java.math.BigDecimal; import java.time.LocalDateTime; diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/ums/domain/MemberAddress.java b/ruoyi-mall/src/main/java/com/cyl/manager/ums/domain/entity/MemberAddress.java similarity index 97% rename from ruoyi-mall/src/main/java/com/cyl/manager/ums/domain/MemberAddress.java rename to ruoyi-mall/src/main/java/com/cyl/manager/ums/domain/entity/MemberAddress.java index c44bdc4..47430bb 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/ums/domain/MemberAddress.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/ums/domain/entity/MemberAddress.java @@ -1,4 +1,4 @@ -package com.cyl.manager.ums.domain; +package com.cyl.manager.ums.domain.entity; import com.ruoyi.common.annotation.Excel; import io.swagger.annotations.ApiModel; diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/ums/domain/MemberCart.java b/ruoyi-mall/src/main/java/com/cyl/manager/ums/domain/entity/MemberCart.java similarity index 96% rename from ruoyi-mall/src/main/java/com/cyl/manager/ums/domain/MemberCart.java rename to ruoyi-mall/src/main/java/com/cyl/manager/ums/domain/entity/MemberCart.java index a8a53cd..054a074 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/ums/domain/MemberCart.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/ums/domain/entity/MemberCart.java @@ -1,4 +1,4 @@ -package com.cyl.manager.ums.domain; +package com.cyl.manager.ums.domain.entity; import com.ruoyi.common.annotation.Excel; import io.swagger.annotations.ApiModel; diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/ums/domain/MemberLogininfor.java b/ruoyi-mall/src/main/java/com/cyl/manager/ums/domain/entity/MemberLogininfor.java similarity index 96% rename from ruoyi-mall/src/main/java/com/cyl/manager/ums/domain/MemberLogininfor.java rename to ruoyi-mall/src/main/java/com/cyl/manager/ums/domain/entity/MemberLogininfor.java index 883f037..61b57db 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/ums/domain/MemberLogininfor.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/ums/domain/entity/MemberLogininfor.java @@ -1,4 +1,4 @@ -package com.cyl.manager.ums.domain; +package com.cyl.manager.ums.domain.entity; import java.time.LocalDateTime; import com.ruoyi.common.annotation.Excel; diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/ums/domain/MemberWechat.java b/ruoyi-mall/src/main/java/com/cyl/manager/ums/domain/entity/MemberWechat.java similarity index 98% rename from ruoyi-mall/src/main/java/com/cyl/manager/ums/domain/MemberWechat.java rename to ruoyi-mall/src/main/java/com/cyl/manager/ums/domain/entity/MemberWechat.java index 7a0cea9..c95cdfc 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/ums/domain/MemberWechat.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/ums/domain/entity/MemberWechat.java @@ -1,4 +1,4 @@ -package com.cyl.manager.ums.domain; +package com.cyl.manager.ums.domain.entity; import java.time.LocalDateTime; import com.ruoyi.common.annotation.Excel; diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/ums/pojo/dto/ChangeMemberStatusDTO.java b/ruoyi-mall/src/main/java/com/cyl/manager/ums/domain/form/ChangeMemberStatusForm.java similarity index 51% rename from ruoyi-mall/src/main/java/com/cyl/manager/ums/pojo/dto/ChangeMemberStatusDTO.java rename to ruoyi-mall/src/main/java/com/cyl/manager/ums/domain/form/ChangeMemberStatusForm.java index 2fdd1e1..735634a 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/ums/pojo/dto/ChangeMemberStatusDTO.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/ums/domain/form/ChangeMemberStatusForm.java @@ -1,9 +1,9 @@ -package com.cyl.manager.ums.pojo.dto; +package com.cyl.manager.ums.domain.form; import lombok.Data; @Data -public class ChangeMemberStatusDTO { +public class ChangeMemberStatusForm { private Long memberId; private Integer status; } diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/ums/pojo/dto/MemberAddressDTO.java b/ruoyi-mall/src/main/java/com/cyl/manager/ums/domain/form/MemberAddressForm.java similarity index 82% rename from ruoyi-mall/src/main/java/com/cyl/manager/ums/pojo/dto/MemberAddressDTO.java rename to ruoyi-mall/src/main/java/com/cyl/manager/ums/domain/form/MemberAddressForm.java index 484dc81..3093970 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/ums/pojo/dto/MemberAddressDTO.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/ums/domain/form/MemberAddressForm.java @@ -1,9 +1,9 @@ -package com.cyl.manager.ums.pojo.dto; +package com.cyl.manager.ums.domain.form; import lombok.Data; @Data -public class MemberAddressDTO { +public class MemberAddressForm { private Long id; private Long memberId; private String name; diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/ums/pojo/query/FeedbackQuery.java b/ruoyi-mall/src/main/java/com/cyl/manager/ums/domain/query/FeedbackQuery.java similarity index 95% rename from ruoyi-mall/src/main/java/com/cyl/manager/ums/pojo/query/FeedbackQuery.java rename to ruoyi-mall/src/main/java/com/cyl/manager/ums/domain/query/FeedbackQuery.java index e008435..8be24cd 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/ums/pojo/query/FeedbackQuery.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/ums/domain/query/FeedbackQuery.java @@ -1,4 +1,4 @@ -package com.cyl.manager.ums.pojo.query; +package com.cyl.manager.ums.domain.query; import java.time.LocalDateTime; import lombok.Data; diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/ums/pojo/query/MemberAccountQuery.java b/ruoyi-mall/src/main/java/com/cyl/manager/ums/domain/query/MemberAccountQuery.java similarity index 87% rename from ruoyi-mall/src/main/java/com/cyl/manager/ums/pojo/query/MemberAccountQuery.java rename to ruoyi-mall/src/main/java/com/cyl/manager/ums/domain/query/MemberAccountQuery.java index 26aaa26..cbdeccc 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/ums/pojo/query/MemberAccountQuery.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/ums/domain/query/MemberAccountQuery.java @@ -1,7 +1,7 @@ -package com.cyl.manager.ums.pojo.query; +package com.cyl.manager.ums.domain.query; import java.math.BigDecimal; -import java.time.LocalDateTime; + import lombok.Data; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/ums/pojo/query/MemberAddressQuery.java b/ruoyi-mall/src/main/java/com/cyl/manager/ums/domain/query/MemberAddressQuery.java similarity index 96% rename from ruoyi-mall/src/main/java/com/cyl/manager/ums/pojo/query/MemberAddressQuery.java rename to ruoyi-mall/src/main/java/com/cyl/manager/ums/domain/query/MemberAddressQuery.java index 50ea9f0..91a8b62 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/ums/pojo/query/MemberAddressQuery.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/ums/domain/query/MemberAddressQuery.java @@ -1,4 +1,4 @@ -package com.cyl.manager.ums.pojo.query; +package com.cyl.manager.ums.domain.query; import lombok.Data; import io.swagger.annotations.ApiModel; diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/ums/pojo/query/MemberCartQuery.java b/ruoyi-mall/src/main/java/com/cyl/manager/ums/domain/query/MemberCartQuery.java similarity index 95% rename from ruoyi-mall/src/main/java/com/cyl/manager/ums/pojo/query/MemberCartQuery.java rename to ruoyi-mall/src/main/java/com/cyl/manager/ums/domain/query/MemberCartQuery.java index 65d1832..6a7a766 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/ums/pojo/query/MemberCartQuery.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/ums/domain/query/MemberCartQuery.java @@ -1,4 +1,4 @@ -package com.cyl.manager.ums.pojo.query; +package com.cyl.manager.ums.domain.query; import lombok.Data; import io.swagger.annotations.ApiModel; diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/ums/pojo/query/MemberLogininforQuery.java b/ruoyi-mall/src/main/java/com/cyl/manager/ums/domain/query/MemberLogininforQuery.java similarity index 95% rename from ruoyi-mall/src/main/java/com/cyl/manager/ums/pojo/query/MemberLogininforQuery.java rename to ruoyi-mall/src/main/java/com/cyl/manager/ums/domain/query/MemberLogininforQuery.java index 9578cab..5a37f70 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/ums/pojo/query/MemberLogininforQuery.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/ums/domain/query/MemberLogininforQuery.java @@ -1,4 +1,4 @@ -package com.cyl.manager.ums.pojo.query; +package com.cyl.manager.ums.domain.query; import java.time.LocalDateTime; import lombok.Data; diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/ums/pojo/query/MemberQuery.java b/ruoyi-mall/src/main/java/com/cyl/manager/ums/domain/query/MemberQuery.java similarity index 97% rename from ruoyi-mall/src/main/java/com/cyl/manager/ums/pojo/query/MemberQuery.java rename to ruoyi-mall/src/main/java/com/cyl/manager/ums/domain/query/MemberQuery.java index e616015..c91ce08 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/ums/pojo/query/MemberQuery.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/ums/domain/query/MemberQuery.java @@ -1,4 +1,4 @@ -package com.cyl.manager.ums.pojo.query; +package com.cyl.manager.ums.domain.query; import java.math.BigDecimal; import java.time.LocalDate; diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/ums/pojo/query/MemberWechatQuery.java b/ruoyi-mall/src/main/java/com/cyl/manager/ums/domain/query/MemberWechatQuery.java similarity index 97% rename from ruoyi-mall/src/main/java/com/cyl/manager/ums/pojo/query/MemberWechatQuery.java rename to ruoyi-mall/src/main/java/com/cyl/manager/ums/domain/query/MemberWechatQuery.java index 66d1c51..e303f1b 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/ums/pojo/query/MemberWechatQuery.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/ums/domain/query/MemberWechatQuery.java @@ -1,4 +1,4 @@ -package com.cyl.manager.ums.pojo.query; +package com.cyl.manager.ums.domain.query; import java.time.LocalDateTime; import lombok.Data; diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/ums/pojo/vo/FeedbackVO.java b/ruoyi-mall/src/main/java/com/cyl/manager/ums/domain/vo/FeedbackVO.java similarity index 96% rename from ruoyi-mall/src/main/java/com/cyl/manager/ums/pojo/vo/FeedbackVO.java rename to ruoyi-mall/src/main/java/com/cyl/manager/ums/domain/vo/FeedbackVO.java index 8572114..0694b31 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/ums/pojo/vo/FeedbackVO.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/ums/domain/vo/FeedbackVO.java @@ -1,4 +1,4 @@ -package com.cyl.manager.ums.pojo.vo; +package com.cyl.manager.ums.domain.vo; import java.time.LocalDateTime; import com.ruoyi.common.annotation.Excel; diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/ums/pojo/vo/MemberAccountVO.java b/ruoyi-mall/src/main/java/com/cyl/manager/ums/domain/vo/MemberAccountVO.java similarity index 87% rename from ruoyi-mall/src/main/java/com/cyl/manager/ums/pojo/vo/MemberAccountVO.java rename to ruoyi-mall/src/main/java/com/cyl/manager/ums/domain/vo/MemberAccountVO.java index 9bf06a8..e0a99bb 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/ums/pojo/vo/MemberAccountVO.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/ums/domain/vo/MemberAccountVO.java @@ -1,9 +1,8 @@ -package com.cyl.manager.ums.pojo.vo; +package com.cyl.manager.ums.domain.vo; import java.math.BigDecimal; import java.time.LocalDateTime; import com.ruoyi.common.annotation.Excel; -import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; /** * 会员账户表 数据视图对象 diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/ums/pojo/vo/MemberAddressVO.java b/ruoyi-mall/src/main/java/com/cyl/manager/ums/domain/vo/MemberAddressVO.java similarity index 96% rename from ruoyi-mall/src/main/java/com/cyl/manager/ums/pojo/vo/MemberAddressVO.java rename to ruoyi-mall/src/main/java/com/cyl/manager/ums/domain/vo/MemberAddressVO.java index 9fd10f7..c0dbf23 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/ums/pojo/vo/MemberAddressVO.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/ums/domain/vo/MemberAddressVO.java @@ -1,4 +1,4 @@ -package com.cyl.manager.ums.pojo.vo; +package com.cyl.manager.ums.domain.vo; import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.core.domain.BaseAudit; diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/ums/pojo/vo/MemberCartVO.java b/ruoyi-mall/src/main/java/com/cyl/manager/ums/domain/vo/MemberCartVO.java similarity index 97% rename from ruoyi-mall/src/main/java/com/cyl/manager/ums/pojo/vo/MemberCartVO.java rename to ruoyi-mall/src/main/java/com/cyl/manager/ums/domain/vo/MemberCartVO.java index 4870dbb..a166000 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/ums/pojo/vo/MemberCartVO.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/ums/domain/vo/MemberCartVO.java @@ -1,4 +1,4 @@ -package com.cyl.manager.ums.pojo.vo; +package com.cyl.manager.ums.domain.vo; import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.core.domain.BaseAudit; diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/ums/pojo/vo/MemberDataStatisticsVO.java b/ruoyi-mall/src/main/java/com/cyl/manager/ums/domain/vo/MemberDataStatisticsVO.java similarity index 92% rename from ruoyi-mall/src/main/java/com/cyl/manager/ums/pojo/vo/MemberDataStatisticsVO.java rename to ruoyi-mall/src/main/java/com/cyl/manager/ums/domain/vo/MemberDataStatisticsVO.java index 29664dd..43cb650 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/ums/pojo/vo/MemberDataStatisticsVO.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/ums/domain/vo/MemberDataStatisticsVO.java @@ -1,4 +1,4 @@ -package com.cyl.manager.ums.pojo.vo; +package com.cyl.manager.ums.domain.vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/ums/pojo/vo/MemberLogininforVO.java b/ruoyi-mall/src/main/java/com/cyl/manager/ums/domain/vo/MemberLogininforVO.java similarity index 96% rename from ruoyi-mall/src/main/java/com/cyl/manager/ums/pojo/vo/MemberLogininforVO.java rename to ruoyi-mall/src/main/java/com/cyl/manager/ums/domain/vo/MemberLogininforVO.java index f04df78..7312828 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/ums/pojo/vo/MemberLogininforVO.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/ums/domain/vo/MemberLogininforVO.java @@ -1,4 +1,4 @@ -package com.cyl.manager.ums.pojo.vo; +package com.cyl.manager.ums.domain.vo; import java.time.LocalDateTime; import com.ruoyi.common.annotation.Excel; diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/ums/pojo/vo/MemberVO.java b/ruoyi-mall/src/main/java/com/cyl/manager/ums/domain/vo/MemberVO.java similarity index 98% rename from ruoyi-mall/src/main/java/com/cyl/manager/ums/pojo/vo/MemberVO.java rename to ruoyi-mall/src/main/java/com/cyl/manager/ums/domain/vo/MemberVO.java index 65c8e95..14a1c64 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/ums/pojo/vo/MemberVO.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/ums/domain/vo/MemberVO.java @@ -1,4 +1,4 @@ -package com.cyl.manager.ums.pojo.vo; +package com.cyl.manager.ums.domain.vo; import java.math.BigDecimal; import java.time.LocalDate; diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/ums/pojo/vo/MemberWechatVO.java b/ruoyi-mall/src/main/java/com/cyl/manager/ums/domain/vo/MemberWechatVO.java similarity index 98% rename from ruoyi-mall/src/main/java/com/cyl/manager/ums/pojo/vo/MemberWechatVO.java rename to ruoyi-mall/src/main/java/com/cyl/manager/ums/domain/vo/MemberWechatVO.java index 1309efd..8e88cb0 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/ums/pojo/vo/MemberWechatVO.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/ums/domain/vo/MemberWechatVO.java @@ -1,4 +1,4 @@ -package com.cyl.manager.ums.pojo.vo; +package com.cyl.manager.ums.domain.vo; import java.time.LocalDateTime; import com.ruoyi.common.annotation.Excel; diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/ums/pojo/vo/form/AddMemberCartForm.java b/ruoyi-mall/src/main/java/com/cyl/manager/ums/domain/vo/form/AddMemberCartForm.java similarity index 90% rename from ruoyi-mall/src/main/java/com/cyl/manager/ums/pojo/vo/form/AddMemberCartForm.java rename to ruoyi-mall/src/main/java/com/cyl/manager/ums/domain/vo/form/AddMemberCartForm.java index bc89550..dbd9883 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/ums/pojo/vo/form/AddMemberCartForm.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/ums/domain/vo/form/AddMemberCartForm.java @@ -1,4 +1,4 @@ -package com.cyl.manager.ums.pojo.vo.form; +package com.cyl.manager.ums.domain.vo.form; import lombok.Data; diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/ums/pojo/vo/form/UpdateMemberCartForm.java b/ruoyi-mall/src/main/java/com/cyl/manager/ums/domain/vo/form/UpdateMemberCartForm.java similarity index 91% rename from ruoyi-mall/src/main/java/com/cyl/manager/ums/pojo/vo/form/UpdateMemberCartForm.java rename to ruoyi-mall/src/main/java/com/cyl/manager/ums/domain/vo/form/UpdateMemberCartForm.java index 52c3d2a..38c135e 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/ums/pojo/vo/form/UpdateMemberCartForm.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/ums/domain/vo/form/UpdateMemberCartForm.java @@ -1,4 +1,4 @@ -package com.cyl.manager.ums.pojo.vo.form; +package com.cyl.manager.ums.domain.vo.form; import lombok.Data; diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/ums/mapper/AddressMapper.java b/ruoyi-mall/src/main/java/com/cyl/manager/ums/mapper/AddressMapper.java index 6c8de80..5a97a37 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/ums/mapper/AddressMapper.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/ums/mapper/AddressMapper.java @@ -1,7 +1,7 @@ package com.cyl.manager.ums.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.cyl.manager.ums.domain.Address; +import com.cyl.manager.ums.domain.entity.Address; import java.util.List; diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/ums/mapper/FeedbackMapper.java b/ruoyi-mall/src/main/java/com/cyl/manager/ums/mapper/FeedbackMapper.java index f158881..bedcf89 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/ums/mapper/FeedbackMapper.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/ums/mapper/FeedbackMapper.java @@ -2,8 +2,7 @@ package com.cyl.manager.ums.mapper; import java.util.List; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Param; -import com.cyl.manager.ums.domain.Feedback; +import com.cyl.manager.ums.domain.entity.Feedback; /** * 意见反馈Mapper接口 diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/ums/mapper/MemberAccountMapper.java b/ruoyi-mall/src/main/java/com/cyl/manager/ums/mapper/MemberAccountMapper.java index f3e5950..9a75b06 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/ums/mapper/MemberAccountMapper.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/ums/mapper/MemberAccountMapper.java @@ -4,7 +4,7 @@ import java.math.BigDecimal; import java.util.List; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; -import com.cyl.manager.ums.domain.MemberAccount; +import com.cyl.manager.ums.domain.entity.MemberAccount; /** * 会员账户表Mapper接口 diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/ums/mapper/MemberAddressMapper.java b/ruoyi-mall/src/main/java/com/cyl/manager/ums/mapper/MemberAddressMapper.java index ee7b859..0f351d2 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/ums/mapper/MemberAddressMapper.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/ums/mapper/MemberAddressMapper.java @@ -2,7 +2,7 @@ package com.cyl.manager.ums.mapper; import java.util.List; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.cyl.manager.ums.domain.MemberAddress; +import com.cyl.manager.ums.domain.entity.MemberAddress; /** * 会员收货地址Mapper接口 diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/ums/mapper/MemberCartMapper.java b/ruoyi-mall/src/main/java/com/cyl/manager/ums/mapper/MemberCartMapper.java index c2d3901..7100c22 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/ums/mapper/MemberCartMapper.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/ums/mapper/MemberCartMapper.java @@ -3,9 +3,9 @@ package com.cyl.manager.ums.mapper; import java.time.LocalDateTime; import java.util.List; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.cyl.manager.ums.domain.MemberCart; -import com.cyl.manager.ums.pojo.query.MemberCartQuery; -import com.cyl.manager.ums.pojo.vo.MemberCartVO; +import com.cyl.manager.ums.domain.entity.MemberCart; +import com.cyl.manager.ums.domain.query.MemberCartQuery; +import com.cyl.manager.ums.domain.vo.MemberCartVO; import org.apache.ibatis.annotations.Param; /** diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/ums/mapper/MemberLogininforMapper.java b/ruoyi-mall/src/main/java/com/cyl/manager/ums/mapper/MemberLogininforMapper.java index 5c14606..d9e70d4 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/ums/mapper/MemberLogininforMapper.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/ums/mapper/MemberLogininforMapper.java @@ -3,9 +3,8 @@ package com.cyl.manager.ums.mapper; import java.time.LocalDateTime; import java.util.List; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.cyl.manager.aws.domain.SystemStatistics; import org.apache.ibatis.annotations.Param; -import com.cyl.manager.ums.domain.MemberLogininfor; +import com.cyl.manager.ums.domain.entity.MemberLogininfor; /** * 会员登录记录Mapper接口 diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/ums/mapper/MemberMapper.java b/ruoyi-mall/src/main/java/com/cyl/manager/ums/mapper/MemberMapper.java index 97abb8b..9443c44 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/ums/mapper/MemberMapper.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/ums/mapper/MemberMapper.java @@ -2,7 +2,7 @@ package com.cyl.manager.ums.mapper; import java.util.List; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.cyl.manager.ums.domain.Member; +import com.cyl.manager.ums.domain.entity.Member; /** * 会员信息Mapper接口 diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/ums/mapper/MemberWechatMapper.java b/ruoyi-mall/src/main/java/com/cyl/manager/ums/mapper/MemberWechatMapper.java index 4de45c6..d911ff1 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/ums/mapper/MemberWechatMapper.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/ums/mapper/MemberWechatMapper.java @@ -2,7 +2,7 @@ package com.cyl.manager.ums.mapper; import java.util.List; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.cyl.manager.ums.domain.MemberWechat; +import com.cyl.manager.ums.domain.entity.MemberWechat; /** * 用户微信信息Mapper接口 diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/ums/service/FeedbackService.java b/ruoyi-mall/src/main/java/com/cyl/manager/ums/service/FeedbackService.java index 90478bb..1acc1a6 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/ums/service/FeedbackService.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/ums/service/FeedbackService.java @@ -1,22 +1,19 @@ package com.cyl.manager.ums.service; import java.time.LocalDateTime; -import java.util.Arrays; import java.util.List; -import java.time.LocalDateTime; + import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.cyl.h5.config.SecurityUtil; -import com.cyl.manager.ums.domain.Member; import com.github.pagehelper.PageHelper; -import com.ruoyi.common.utils.AesCryptoUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Pageable; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import com.cyl.manager.ums.mapper.FeedbackMapper; -import com.cyl.manager.ums.domain.Feedback; -import com.cyl.manager.ums.pojo.query.FeedbackQuery; +import com.cyl.manager.ums.domain.entity.Feedback; +import com.cyl.manager.ums.domain.query.FeedbackQuery; /** * 意见反馈Service业务层处理 diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/ums/service/MemberAccountService.java b/ruoyi-mall/src/main/java/com/cyl/manager/ums/service/MemberAccountService.java index 8644812..f21aecc 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/ums/service/MemberAccountService.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/ums/service/MemberAccountService.java @@ -2,18 +2,16 @@ package com.cyl.manager.ums.service; import java.math.BigDecimal; import java.time.LocalDateTime; -import java.util.Arrays; import java.util.List; -import java.time.LocalDateTime; + import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Pageable; -import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import com.cyl.manager.ums.mapper.MemberAccountMapper; -import com.cyl.manager.ums.domain.MemberAccount; -import com.cyl.manager.ums.pojo.query.MemberAccountQuery; +import com.cyl.manager.ums.domain.entity.MemberAccount; +import com.cyl.manager.ums.domain.query.MemberAccountQuery; /** * 会员账户表Service业务层处理 diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/ums/service/MemberAddressService.java b/ruoyi-mall/src/main/java/com/cyl/manager/ums/service/MemberAddressService.java index 97b45be..a915239 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/ums/service/MemberAddressService.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/ums/service/MemberAddressService.java @@ -3,9 +3,9 @@ package com.cyl.manager.ums.service; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.cyl.manager.ums.convert.MemberAddressConvert; -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.pojo.query.MemberAddressQuery; +import com.cyl.manager.ums.domain.query.MemberAddressQuery; import com.github.pagehelper.PageHelper; import com.ruoyi.common.utils.AesCryptoUtils; import com.ruoyi.common.utils.SecurityUtils; diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/ums/service/MemberCartService.java b/ruoyi-mall/src/main/java/com/cyl/manager/ums/service/MemberCartService.java index 74cd6f1..20d8ad5 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/ums/service/MemberCartService.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/ums/service/MemberCartService.java @@ -5,17 +5,17 @@ import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; 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.SkuMapper; import com.cyl.manager.ums.convert.MemberCartConvert; -import com.cyl.manager.ums.domain.Member; -import com.cyl.manager.ums.domain.MemberCart; +import com.cyl.manager.ums.domain.entity.Member; +import com.cyl.manager.ums.domain.entity.MemberCart; import com.cyl.manager.ums.mapper.MemberCartMapper; import com.cyl.manager.ums.mapper.MemberMapper; -import com.cyl.manager.ums.pojo.query.MemberCartQuery; -import com.cyl.manager.ums.pojo.vo.MemberCartVO; -import com.cyl.manager.ums.pojo.vo.form.UpdateMemberCartForm; +import com.cyl.manager.ums.domain.query.MemberCartQuery; +import com.cyl.manager.ums.domain.vo.MemberCartVO; +import com.cyl.manager.ums.domain.vo.form.UpdateMemberCartForm; import com.github.pagehelper.PageHelper; import com.ruoyi.common.constant.Constants; import com.ruoyi.common.exception.base.BaseException; diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/ums/service/MemberLogininforService.java b/ruoyi-mall/src/main/java/com/cyl/manager/ums/service/MemberLogininforService.java index aa6174e..d1f6e77 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/ums/service/MemberLogininforService.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/ums/service/MemberLogininforService.java @@ -1,29 +1,21 @@ package com.cyl.manager.ums.service; -import java.time.LocalDateTime; -import java.util.Arrays; import java.util.List; -import java.time.LocalDateTime; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; 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.mapper.MemberMapper; import com.github.pagehelper.PageHelper; -import com.ruoyi.common.core.domain.model.LoginMember; import com.ruoyi.common.utils.AesCryptoUtils; -import com.ruoyi.common.utils.ServletUtils; -import com.ruoyi.common.utils.ip.AddressUtils; -import com.ruoyi.common.utils.ip.IpUtils; -import eu.bitwalker.useragentutils.UserAgent; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.data.domain.Pageable; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import com.cyl.manager.ums.mapper.MemberLogininforMapper; -import com.cyl.manager.ums.domain.MemberLogininfor; -import com.cyl.manager.ums.pojo.query.MemberLogininforQuery; +import com.cyl.manager.ums.domain.entity.MemberLogininfor; +import com.cyl.manager.ums.domain.query.MemberLogininforQuery; /** * 会员登录记录Service业务层处理 diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/ums/service/MemberService.java b/ruoyi-mall/src/main/java/com/cyl/manager/ums/service/MemberService.java index 672a14c..dd05e74 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/ums/service/MemberService.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/ums/service/MemberService.java @@ -5,13 +5,13 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.cyl.manager.oms.mapper.AftersaleMapper; import com.cyl.manager.oms.mapper.OrderMapper; -import com.cyl.manager.ums.domain.Member; -import com.cyl.manager.ums.domain.MemberCart; +import com.cyl.manager.ums.domain.entity.Member; +import com.cyl.manager.ums.domain.entity.MemberCart; import com.cyl.manager.ums.mapper.MemberCartMapper; import com.cyl.manager.ums.mapper.MemberMapper; -import com.cyl.manager.ums.pojo.dto.ChangeMemberStatusDTO; -import com.cyl.manager.ums.pojo.query.MemberQuery; -import com.cyl.manager.ums.pojo.vo.MemberDataStatisticsVO; +import com.cyl.manager.ums.domain.form.ChangeMemberStatusForm; +import com.cyl.manager.ums.domain.query.MemberQuery; +import com.cyl.manager.ums.domain.vo.MemberDataStatisticsVO; import com.github.pagehelper.PageHelper; import com.ruoyi.common.utils.AesCryptoUtils; import com.ruoyi.common.utils.SortUtil; @@ -137,7 +137,7 @@ public class MemberService { return memberMapper.deleteById(id); } - public Integer changeStatus(ChangeMemberStatusDTO dto) { + public Integer changeStatus(ChangeMemberStatusForm dto) { UpdateWrapper wrapper = new UpdateWrapper<>(); wrapper.eq("id", dto.getMemberId()); wrapper.set("status", dto.getStatus()); diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/ums/service/MemberWechatService.java b/ruoyi-mall/src/main/java/com/cyl/manager/ums/service/MemberWechatService.java index 0ab0a16..dd2254b 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/ums/service/MemberWechatService.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/ums/service/MemberWechatService.java @@ -9,15 +9,13 @@ import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.cyl.config.WechatConfig; import com.cyl.external.WechatUtil; import com.cyl.external.resp.AccessTokenResp; import com.cyl.external.resp.UserInfoResp; -import com.cyl.h5.pojo.vo.form.WechatLoginForm; +import com.cyl.h5.domain.form.WechatLoginForm; import com.cyl.h5.service.H5MemberService; import com.cyl.manager.ums.convert.MemberWechatConvert; -import com.cyl.manager.ums.domain.Member; -import com.cyl.manager.ums.mapper.MemberMapper; +import com.cyl.manager.ums.domain.entity.Member; import com.cyl.wechat.WechatPayData; import com.github.pagehelper.PageHelper; import com.ruoyi.common.core.domain.entity.SysUser; @@ -32,8 +30,8 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Service; import com.cyl.manager.ums.mapper.MemberWechatMapper; -import com.cyl.manager.ums.domain.MemberWechat; -import com.cyl.manager.ums.pojo.query.MemberWechatQuery; +import com.cyl.manager.ums.domain.entity.MemberWechat; +import com.cyl.manager.ums.domain.query.MemberWechatQuery; import org.springframework.web.client.RestTemplate; /** diff --git a/ruoyi-mall/src/main/resources/mapper/act/IntegralHistoryMapper.xml b/ruoyi-mall/src/main/resources/mapper/act/IntegralHistoryMapper.xml index 428a57c..5a04877 100644 --- a/ruoyi-mall/src/main/resources/mapper/act/IntegralHistoryMapper.xml +++ b/ruoyi-mall/src/main/resources/mapper/act/IntegralHistoryMapper.xml @@ -30,7 +30,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and order_id = #{orderId} - select sum(case when op_type = 1 then amount else 0 end) as income, sum(case when op_type = 2 then amount else 0 end) as expenditure from act_integral_history diff --git a/ruoyi-mall/src/main/resources/mapper/oms/AftersaleMapper.xml b/ruoyi-mall/src/main/resources/mapper/oms/AftersaleMapper.xml index 099290e..7bb2a40 100644 --- a/ruoyi-mall/src/main/resources/mapper/oms/AftersaleMapper.xml +++ b/ruoyi-mall/src/main/resources/mapper/oms/AftersaleMapper.xml @@ -49,7 +49,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and handle_man = #{handleMan} - SELECT a.id id, a.return_amount applyReturnAmount, a.quantity refundNum, @@ -97,7 +97,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where member_id=#{memberId} - select a.id, a.order_sn orderSn, @@ -156,7 +156,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" order by a.create_time desc - select id orderId, pay_id, @@ -192,7 +192,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" order by create_time desc - select id orderId, pay_id, @@ -217,7 +217,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" delete_status=0 and id=#{orderId} - select IFNULL(sum(case when status=0 and aftersale_status=1 then 1 else 0 end),0) unpaid, IFNULL(sum(case when status=1 and aftersale_status=1 then 1 else 0 end),0) nosend, @@ -226,7 +226,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" from oms_order where member_id=#{memberId} and delete_status=0 - select IFNULL(count(id), 0) orderCount, IFNULL(sum(pay_amount), 0) orderAmount @@ -236,7 +236,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select IFNULL(sum(case when status in (2,3) then 1 else 0 end), 0) todayHasDeliveredCount, IFNULL(count(id), 0) todayOrderCount, @@ -244,7 +244,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" from oms_order where create_time between #{startTime} and #{endTime} - select IFNULL(count(distinct member_id), 0) createOrderMemberCount, IFNULL(count(id), 0) orderCount, diff --git a/ruoyi-mall/src/main/resources/mapper/statistics/IndexStatisticsMapper.xml b/ruoyi-mall/src/main/resources/mapper/statistics/IndexStatisticsMapper.xml index 21335c8..4b86c1d 100644 --- a/ruoyi-mall/src/main/resources/mapper/statistics/IndexStatisticsMapper.xml +++ b/ruoyi-mall/src/main/resources/mapper/statistics/IndexStatisticsMapper.xml @@ -46,13 +46,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" SELECT date_sub( curdate( ), INTERVAL 5 DAY ) AS date UNION ALL SELECT date_sub( curdate( ), INTERVAL 6 DAY ) AS date - + - SELECT product_id , product_name, pic, @@ -63,7 +63,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ORDER BY total_sales DESC LIMIT #{size} - select a.date, IFNULL(b.order_count,0) orderCount, IFNULL(b.order_amount,0) orderAmount diff --git a/ruoyi-mall/src/main/resources/mapper/ums/MemberCartMapper.xml b/ruoyi-mall/src/main/resources/mapper/ums/MemberCartMapper.xml index 1c39af6..0ae91ce 100644 --- a/ruoyi-mall/src/main/resources/mapper/ums/MemberCartMapper.xml +++ b/ruoyi-mall/src/main/resources/mapper/ums/MemberCartMapper.xml @@ -41,7 +41,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and quantity = #{quantity} - select a.id, a.member_id,