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 c23ebae..0f3a324 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 @@ -2,7 +2,7 @@ package com.cyl.h5.controller; import com.alibaba.fastjson.JSON; import com.cyl.h5.domain.vo.H5LoginVO; -import com.cyl.h5.domain.form.RegisterRequest; +import com.cyl.h5.domain.form.RegisterForm; import com.cyl.h5.domain.vo.RegisterResponse; import com.cyl.h5.domain.vo.ValidatePhoneResponse; import com.cyl.h5.domain.vo.H5LoginResponse; @@ -31,7 +31,7 @@ public class H5MemberController { @ApiOperation("会员注册") @PostMapping("/register") - public ResponseEntity register(@RequestBody RegisterRequest request){ + public ResponseEntity register(@RequestBody RegisterForm request){ return ResponseEntity.ok(service.register(request)); } 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 8560a71..a49ef11 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,10 +1,10 @@ package com.cyl.h5.controller; import com.alibaba.fastjson.JSONObject; -import com.cyl.h5.domain.form.ApplyRefundDTO; +import com.cyl.h5.domain.form.ApplyRefundForm; 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.form.CancelOrderForm; +import com.cyl.h5.domain.form.OrderPayForm; import com.cyl.h5.domain.vo.OrderPayResponse; import com.cyl.h5.domain.vo.AftersaleRefundInfoVO; import com.cyl.h5.domain.vo.CountOrderVO; @@ -108,7 +108,7 @@ public class H5OrderController { @ApiOperation("取消订单") @PostMapping("/orderCancel") - public ResponseEntity orderCancel(@RequestBody CancelOrderRequest request){ + public ResponseEntity orderCancel(@RequestBody CancelOrderForm request){ Member member = (Member) LocalDataUtil.getVar(Constants.MEMBER_INFO); String redisKey = "h5_oms_order_cancel_"+ request.getIdList().get(0); String redisValue = request.getIdList().get(0)+"_"+System.currentTimeMillis(); @@ -129,7 +129,7 @@ public class H5OrderController { @ApiOperation("订单支付") @PostMapping("/orderPay") - public ResponseEntity orderPay(@RequestBody OrderPayRequest req){ + public ResponseEntity orderPay(@RequestBody OrderPayForm req){ log.info("订单支付","提交的数据："+JSONObject.toJSONString(req)); String redisKey = "h5_oms_order_pay_"+req.getPayId(); String redisValue = req.getPayId()+"_"+System.currentTimeMillis(); @@ -153,12 +153,12 @@ public class H5OrderController { @ApiOperation("申请售后") @PostMapping("/applyRefund") - public ResponseEntity applyRefund(@RequestBody ApplyRefundDTO applyRefundDTO){ - String redisKey = "h5_oms_order_applyRefund_" + applyRefundDTO.getOrderId(); - String redisValue = applyRefundDTO.getOrderId() + "_" + System.currentTimeMillis(); + public ResponseEntity applyRefund(@RequestBody ApplyRefundForm applyRefundForm){ + String redisKey = "h5_oms_order_applyRefund_" + applyRefundForm.getOrderId(); + String redisValue = applyRefundForm.getOrderId() + "_" + System.currentTimeMillis(); try{ redisService.lock(redisKey, redisValue, 60); - return ResponseEntity.ok(service.applyRefund(applyRefundDTO)); + return ResponseEntity.ok(service.applyRefund(applyRefundForm)); }catch (Exception e){ log.error("申请售后发生异常",e); throw new RuntimeException(e.getMessage()); diff --git a/ruoyi-mall/src/main/java/com/cyl/h5/domain/form/ApplyRefundDTO.java b/ruoyi-mall/src/main/java/com/cyl/h5/domain/form/ApplyRefundForm.java similarity index 96% rename from ruoyi-mall/src/main/java/com/cyl/h5/domain/form/ApplyRefundDTO.java rename to ruoyi-mall/src/main/java/com/cyl/h5/domain/form/ApplyRefundForm.java index e2feaeb..27e7889 100644 --- a/ruoyi-mall/src/main/java/com/cyl/h5/domain/form/ApplyRefundDTO.java +++ b/ruoyi-mall/src/main/java/com/cyl/h5/domain/form/ApplyRefundForm.java @@ -8,7 +8,7 @@ import java.math.BigDecimal; @Data @ApiModel("申请售后对象") -public class ApplyRefundDTO { +public class ApplyRefundForm { @ApiModelProperty(value = "订单id", required = true) private Long orderId; diff --git a/ruoyi-mall/src/main/java/com/cyl/h5/domain/form/BindOpenIdRequest.java b/ruoyi-mall/src/main/java/com/cyl/h5/domain/form/BindOpenIDForm.java similarity index 88% rename from ruoyi-mall/src/main/java/com/cyl/h5/domain/form/BindOpenIdRequest.java rename to ruoyi-mall/src/main/java/com/cyl/h5/domain/form/BindOpenIDForm.java index 2433982..417a5c5 100644 --- a/ruoyi-mall/src/main/java/com/cyl/h5/domain/form/BindOpenIdRequest.java +++ b/ruoyi-mall/src/main/java/com/cyl/h5/domain/form/BindOpenIDForm.java @@ -6,7 +6,7 @@ import lombok.Data; @ApiModel("绑定openId请求对象") @Data -public class BindOpenIdRequest { +public class BindOpenIDForm { @ApiModelProperty("wx提供的code") private String code; } diff --git a/ruoyi-mall/src/main/java/com/cyl/h5/domain/form/CancelOrderRequest.java b/ruoyi-mall/src/main/java/com/cyl/h5/domain/form/CancelOrderForm.java similarity index 89% rename from ruoyi-mall/src/main/java/com/cyl/h5/domain/form/CancelOrderRequest.java rename to ruoyi-mall/src/main/java/com/cyl/h5/domain/form/CancelOrderForm.java index 2bed6b4..370617c 100644 --- a/ruoyi-mall/src/main/java/com/cyl/h5/domain/form/CancelOrderRequest.java +++ b/ruoyi-mall/src/main/java/com/cyl/h5/domain/form/CancelOrderForm.java @@ -8,7 +8,7 @@ import java.util.List; @Data @ApiModel("取消订单请求") -public class CancelOrderRequest { +public class CancelOrderForm { @ApiModelProperty("要取消的订单id集合") private List idList; } diff --git a/ruoyi-mall/src/main/java/com/cyl/h5/domain/form/H5AccountLoginRequest.java b/ruoyi-mall/src/main/java/com/cyl/h5/domain/form/H5AccountLoginForm.java similarity index 64% rename from ruoyi-mall/src/main/java/com/cyl/h5/domain/form/H5AccountLoginRequest.java rename to ruoyi-mall/src/main/java/com/cyl/h5/domain/form/H5AccountLoginForm.java index bfc6357..49e4c7a 100644 --- a/ruoyi-mall/src/main/java/com/cyl/h5/domain/form/H5AccountLoginRequest.java +++ b/ruoyi-mall/src/main/java/com/cyl/h5/domain/form/H5AccountLoginForm.java @@ -3,7 +3,7 @@ package com.cyl.h5.domain.form; import lombok.Data; @Data -public class H5AccountLoginRequest extends H5LoginRequest{ +public class H5AccountLoginForm extends H5LoginForm { /** 密码 */ private String password; } diff --git a/ruoyi-mall/src/main/java/com/cyl/h5/domain/form/H5LoginRequest.java b/ruoyi-mall/src/main/java/com/cyl/h5/domain/form/H5LoginForm.java similarity index 79% rename from ruoyi-mall/src/main/java/com/cyl/h5/domain/form/H5LoginRequest.java rename to ruoyi-mall/src/main/java/com/cyl/h5/domain/form/H5LoginForm.java index 3119407..b54a8f2 100644 --- a/ruoyi-mall/src/main/java/com/cyl/h5/domain/form/H5LoginRequest.java +++ b/ruoyi-mall/src/main/java/com/cyl/h5/domain/form/H5LoginForm.java @@ -3,7 +3,7 @@ package com.cyl.h5.domain.form; import lombok.Data; @Data -public class H5LoginRequest { +public class H5LoginForm { /** 账号即手机号 */ private String mobile; } diff --git a/ruoyi-mall/src/main/java/com/cyl/h5/domain/form/H5SmsLoginRequest.java b/ruoyi-mall/src/main/java/com/cyl/h5/domain/form/H5SmsLoginForm.java similarity index 85% rename from ruoyi-mall/src/main/java/com/cyl/h5/domain/form/H5SmsLoginRequest.java rename to ruoyi-mall/src/main/java/com/cyl/h5/domain/form/H5SmsLoginForm.java index 2d603e3..a2e5d01 100644 --- a/ruoyi-mall/src/main/java/com/cyl/h5/domain/form/H5SmsLoginRequest.java +++ b/ruoyi-mall/src/main/java/com/cyl/h5/domain/form/H5SmsLoginForm.java @@ -4,7 +4,7 @@ import com.cyl.wechat.response.WechatUserAuth; import lombok.Data; @Data -public class H5SmsLoginRequest extends H5LoginRequest { +public class H5SmsLoginForm extends H5LoginForm { /** 验证码 */ private String code; /** uuid */ diff --git a/ruoyi-mall/src/main/java/com/cyl/h5/domain/form/OrderPayRequest.java b/ruoyi-mall/src/main/java/com/cyl/h5/domain/form/OrderPayForm.java similarity index 95% rename from ruoyi-mall/src/main/java/com/cyl/h5/domain/form/OrderPayRequest.java rename to ruoyi-mall/src/main/java/com/cyl/h5/domain/form/OrderPayForm.java index 612464c..206d36d 100644 --- a/ruoyi-mall/src/main/java/com/cyl/h5/domain/form/OrderPayRequest.java +++ b/ruoyi-mall/src/main/java/com/cyl/h5/domain/form/OrderPayForm.java @@ -6,7 +6,7 @@ import lombok.Data; @Data @ApiModel("订单支付请求体") -public class OrderPayRequest { +public class OrderPayForm { @ApiModelProperty(value = "支付id", required = true) private Long payId; diff --git a/ruoyi-mall/src/main/java/com/cyl/h5/domain/form/RegisterRequest.java b/ruoyi-mall/src/main/java/com/cyl/h5/domain/form/RegisterForm.java similarity index 94% rename from ruoyi-mall/src/main/java/com/cyl/h5/domain/form/RegisterRequest.java rename to ruoyi-mall/src/main/java/com/cyl/h5/domain/form/RegisterForm.java index 31ed4f8..9924624 100644 --- a/ruoyi-mall/src/main/java/com/cyl/h5/domain/form/RegisterRequest.java +++ b/ruoyi-mall/src/main/java/com/cyl/h5/domain/form/RegisterForm.java @@ -6,7 +6,7 @@ import lombok.Data; import javax.validation.constraints.NotBlank; @Data -public class RegisterRequest { +public class RegisterForm { @ApiModelProperty("手机号") @NotBlank 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 d6b4b8b..f1a1888 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 @@ -13,7 +13,7 @@ import com.cyl.manager.ums.domain.entity.MemberCart; import com.cyl.manager.ums.mapper.MemberCartMapper; 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.cyl.manager.ums.domain.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 c7839ed..f2b30cf 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 @@ -7,10 +7,10 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.cyl.config.AESForWeixinGetPhoneNumber; import com.cyl.h5.domain.vo.H5LoginVO; -import com.cyl.h5.domain.form.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.form.BindOpenIDForm; +import com.cyl.h5.domain.form.H5AccountLoginForm; +import com.cyl.h5.domain.form.H5SmsLoginForm; +import com.cyl.h5.domain.form.RegisterForm; import com.cyl.h5.domain.vo.RegisterResponse; import com.cyl.h5.domain.vo.ValidatePhoneResponse; import com.cyl.h5.domain.vo.H5LoginResponse; @@ -79,7 +79,7 @@ public class H5MemberService { * @return 结果 */ @Transactional - public RegisterResponse register(RegisterRequest request){ + public RegisterResponse register(RegisterForm request){ LocalDateTime optDate = LocalDateTime.now(); RegisterResponse response = new RegisterResponse(); //校验验证码 @@ -145,7 +145,7 @@ public class H5MemberService { throw new RuntimeException(Constants.LOGIN_INFO.WRONG); } // 解码 转 对象 - H5AccountLoginRequest request = JSON.parseObject(new String(Base64Utils.decodeFromString(data)), H5AccountLoginRequest.class); + H5AccountLoginForm request = JSON.parseObject(new String(Base64Utils.decodeFromString(data)), H5AccountLoginForm.class); log.info("account login request:{}", JSONUtil.toJsonStr(request)); QueryWrapper qw = new QueryWrapper<>(); qw.eq("phone_encrypted", AesCryptoUtils.encrypt(aesKey, request.getMobile())); @@ -166,7 +166,7 @@ public class H5MemberService { if (StringUtils.isEmpty(data)){ throw new RuntimeException(Constants.LOGIN_INFO.WRONG); } - H5SmsLoginRequest request = JSON.parseObject(new String(Base64Utils.decodeFromString(data)), H5SmsLoginRequest.class); + H5SmsLoginForm request = JSON.parseObject(new String(Base64Utils.decodeFromString(data)), H5SmsLoginForm.class); //校验验证码 this.validateVerifyCode(request.getUuid(), request.getMobile(), request.getCode()); //查会员 @@ -289,7 +289,7 @@ public class H5MemberService { } public WechatUserAuth getWechatUserAuth(String data) { - BindOpenIdRequest request = JSON.parseObject(new String(Base64Utils.decodeFromString(data)), BindOpenIdRequest.class); + BindOpenIDForm request = JSON.parseObject(new String(Base64Utils.decodeFromString(data)), BindOpenIDForm.class); WechatUserAuth userToken = wechatAuthService.getUserToken(request.getCode()); if (userToken == null){ log.error("微信授权失败"); 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 391a593..107f3bb 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,12 +8,12 @@ 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.domain.form.ApplyRefundDTO; +import com.cyl.h5.domain.form.ApplyRefundForm; 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.form.CancelOrderForm; +import com.cyl.h5.domain.form.OrderPayForm; import com.cyl.h5.domain.vo.OrderPayResponse; import com.cyl.h5.domain.vo.*; import com.cyl.h5.domain.form.OrderSubmitForm; @@ -435,7 +435,7 @@ public class H5OrderService { } @Transactional - public String orderBatchCancel(CancelOrderRequest request, Long userId) { + public String orderBatchCancel(CancelOrderForm request, Long userId) { LocalDateTime optDate = LocalDateTime.now(); if (CollectionUtil.isEmpty(request.getIdList())){ throw new RuntimeException("未指定需要取消的订单号"); @@ -498,7 +498,7 @@ public class H5OrderService { * @param req 支付请求 * @return */ - public OrderPayResponse orderPay(OrderPayRequest req) { + public OrderPayResponse orderPay(OrderPayForm req) { QueryWrapper qw = new QueryWrapper<>(); qw.eq("pay_id", req.getPayId()); qw.eq("status", 0); @@ -648,12 +648,12 @@ public class H5OrderService { /** * 申请售后 - * @param applyRefundDTO + * @param applyRefundForm * @return */ @Transactional - public String applyRefund(ApplyRefundDTO applyRefundDTO) { - Order order = orderMapper.selectById(applyRefundDTO.getOrderId()); + public String applyRefund(ApplyRefundForm applyRefundForm) { + Order order = orderMapper.selectById(applyRefundForm.getOrderId()); //是否符合售后条件 this.checkIfCanApplyRefund(order); LocalDateTime optDate = LocalDateTime.now(); @@ -664,13 +664,13 @@ public class H5OrderService { addAftersale.setMemberId(order.getMemberId()); addAftersale.setOrderId(order.getId()); addAftersale.setReturnAmount(order.getPayAmount()); - addAftersale.setType(applyRefundDTO.getApplyRefundType()); + addAftersale.setType(applyRefundForm.getApplyRefundType()); addAftersale.setStatus(AftersaleStatus.APPLY.getType()); - addAftersale.setReason(applyRefundDTO.getReason()); - addAftersale.setQuantity(applyRefundDTO.getQuantity()); - addAftersale.setReason(applyRefundDTO.getReason()); - addAftersale.setDescription(applyRefundDTO.getDescription()); - addAftersale.setProofPics(applyRefundDTO.getProofPics()); + addAftersale.setReason(applyRefundForm.getReason()); + addAftersale.setQuantity(applyRefundForm.getQuantity()); + addAftersale.setReason(applyRefundForm.getReason()); + addAftersale.setDescription(applyRefundForm.getDescription()); + addAftersale.setProofPics(applyRefundForm.getProofPics()); addAftersale.setCreateTime(optDate); addAftersale.setCreateBy(memberId); addAftersale.setUpdateTime(optDate); 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 9e59e7b..4389ad0 100644 --- a/ruoyi-mall/src/main/java/com/cyl/job/OrderJob.java +++ b/ruoyi-mall/src/main/java/com/cyl/job/OrderJob.java @@ -2,7 +2,7 @@ package com.cyl.job; import cn.hutool.core.date.LocalDateTimeUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.cyl.h5.domain.form.CancelOrderRequest; +import com.cyl.h5.domain.form.CancelOrderForm; import com.cyl.h5.service.H5OrderService; import com.cyl.manager.oms.domain.entity.Order; import com.cyl.manager.oms.mapper.OrderMapper; @@ -40,7 +40,7 @@ public class OrderJob { .filter(order -> LocalDateTimeUtil.between(order.getCreateTime(), LocalDateTime.now()).toMinutes() >= 15) .map(Order::getId) .collect(Collectors.toList()); - CancelOrderRequest request = new CancelOrderRequest(); + CancelOrderForm request = new CancelOrderForm(); request.setIdList(idList); h5OrderService.orderBatchCancel(request, null); log.info("【取消订单任务结束】"); 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 b970da0..1e3fc09 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,8 +2,8 @@ package com.cyl.manager.oms.controller; import java.util.List; -import com.cyl.manager.oms.domain.form.DealWithAftersaleRequest; -import com.cyl.manager.oms.domain.form.ManagerAftersaleOrderRequest; +import com.cyl.manager.oms.domain.form.DealWithAftersaleForm; +import com.cyl.manager.oms.domain.form.ManagerAftersaleOrderForm; import com.cyl.manager.oms.domain.vo.ManagerRefundOrderDetailVO; import com.cyl.manager.oms.domain.vo.ManagerRefundOrderVO; import com.cyl.manager.oms.domain.vo.OrderOperateHistoryVO; @@ -56,7 +56,7 @@ public class AftersaleController extends BaseController { @ApiOperation("查询订单售后列表") @PreAuthorize("@ss.hasPermi('oms:aftersale:list')") @PostMapping("/list") - public ResponseEntity> list(@RequestBody ManagerAftersaleOrderRequest query, Pageable page) { + public ResponseEntity> list(@RequestBody ManagerAftersaleOrderForm query, Pageable page) { List list = service.selectList(query, page); return ResponseEntity.ok(new PageImpl<>(list, page, ((com.github.pagehelper.Page)list).getTotal())); } @@ -105,7 +105,7 @@ public class AftersaleController extends BaseController { @ApiOperation("售后订单操作") @PostMapping("/dealWith") - public ResponseEntity updateStatus(@RequestBody DealWithAftersaleRequest request){ + public ResponseEntity updateStatus(@RequestBody DealWithAftersaleForm request){ LoginUser user = SecurityUtils.getLoginUser(); String redisKey = "manager_oms_order_updateOrderStatus_" + user.getUserId(); String redisValue = user.getUserId() + "_" + System.currentTimeMillis(); 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 2f49fd3..55ccc27 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 @@ -3,8 +3,8 @@ package com.cyl.manager.oms.controller; import com.cyl.manager.oms.convert.OrderConvert; 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.form.DeliverProductForm; +import com.cyl.manager.oms.domain.form.ManagerOrderQueryForm; import com.cyl.manager.oms.domain.vo.ManagerOrderDetailVO; import com.cyl.manager.oms.domain.vo.ManagerOrderVO; import com.cyl.manager.oms.domain.vo.OrderOperateHistoryVO; @@ -46,7 +46,7 @@ public class OrderController extends BaseController { @ApiOperation("查询订单表列表") @PreAuthorize("@ss.hasPermi('oms:order:list')") @PostMapping("/list") - public ResponseEntity> list(@RequestBody ManagerOrderQueryRequest query, Pageable page) { + public ResponseEntity> list(@RequestBody ManagerOrderQueryForm query, Pageable page) { return ResponseEntity.ok(service.selectList(query, page)); } @@ -103,7 +103,7 @@ public class OrderController extends BaseController { @ApiOperation("管理后台订单发货") @PreAuthorize("@ss.hasPermi('oms:order:delivery')") @PostMapping("/deliverProduct") - public ResponseEntity delivery(@RequestBody DeliverProductRequest request){ + public ResponseEntity delivery(@RequestBody DeliverProductForm request){ Long userId = SecurityUtils.getUserId(); String redisKey = "oms_order_deliverProduct" + request.getOrderId(); String redisValue = request.getOrderId() + "_" + System.currentTimeMillis(); diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/form/DealWithAftersaleRequest.java b/ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/form/DealWithAftersaleForm.java similarity index 95% rename from ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/form/DealWithAftersaleRequest.java rename to ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/form/DealWithAftersaleForm.java index 4cb151e..4b31f2a 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/form/DealWithAftersaleRequest.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/form/DealWithAftersaleForm.java @@ -9,7 +9,7 @@ import javax.validation.constraints.NotNull; @Data @ApiModel(value = "商城售后订单处理操作请求体") - public class DealWithAftersaleRequest { + public class DealWithAftersaleForm { @ApiModelProperty(name = "orderId",value = "订单id",required = true,dataType = "Long") @NotBlank(message = "订单id不能为空") private Long orderId; diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/form/DeliverProductRequest.java b/ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/form/DeliverProductForm.java similarity index 94% rename from ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/form/DeliverProductRequest.java rename to ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/form/DeliverProductForm.java index a23f4b4..144e843 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/form/DeliverProductRequest.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/form/DeliverProductForm.java @@ -8,7 +8,7 @@ import javax.validation.constraints.NotBlank; @Getter @Setter -public class DeliverProductRequest { +public class DeliverProductForm { @ApiModelProperty("订单id") @NotBlank(message = "订单id不能为空") @Excel(name = "订单号") diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/form/ManagerAftersaleOrderRequest.java b/ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/form/ManagerAftersaleOrderForm.java similarity index 97% rename from ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/form/ManagerAftersaleOrderRequest.java rename to ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/form/ManagerAftersaleOrderForm.java index c278152..e2daeb7 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/form/ManagerAftersaleOrderRequest.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/form/ManagerAftersaleOrderForm.java @@ -11,7 +11,7 @@ import java.time.LocalDateTime; @Data @ApiModel(value = "商城订单请求体") -public class ManagerAftersaleOrderRequest { +public class ManagerAftersaleOrderForm { @ApiModelProperty(name = "id", value = "售后单号", required = true, dataType = "Long") private Long id; diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/form/ManagerOrderQueryRequest.java b/ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/form/ManagerOrderQueryForm.java similarity index 98% rename from ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/form/ManagerOrderQueryRequest.java rename to ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/form/ManagerOrderQueryForm.java index eddaefe..29a11b7 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/form/ManagerOrderQueryRequest.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/form/ManagerOrderQueryForm.java @@ -10,7 +10,7 @@ import java.time.LocalDateTime; @Data @ApiModel("后台订单查询请求体") -public class ManagerOrderQueryRequest { +public class ManagerOrderQueryForm { @ApiModelProperty(name = "orderId", value = "订单id", required = true, dataType = "Long") private Long orderId; 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 77482a0..c886d75 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 @@ -3,7 +3,7 @@ package com.cyl.manager.oms.mapper; import java.util.List; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.cyl.manager.oms.domain.entity.Aftersale; -import com.cyl.manager.oms.domain.form.ManagerAftersaleOrderRequest; +import com.cyl.manager.oms.domain.form.ManagerAftersaleOrderForm; import com.cyl.manager.oms.domain.vo.ManagerRefundOrderVO; import com.cyl.manager.statistics.domain.vo.OrderAndAftersaleStatisticsVO; @@ -21,7 +21,7 @@ public interface AftersaleMapper extends BaseMapper { */ List selectByEntity(Aftersale aftersale); - List selectManagerRefundOrder(ManagerAftersaleOrderRequest managerAftersaleOrderPageRequest); + List selectManagerRefundOrder(ManagerAftersaleOrderForm managerAftersaleOrderPageRequest); int countByMemberId(Long memberId); 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 1bee267..846bdfc 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 @@ -7,7 +7,7 @@ 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.form.ManagerOrderQueryForm; import com.cyl.manager.oms.domain.vo.ManagerOrderVO; import com.cyl.manager.statistics.domain.vo.OrderAndAftersaleStatisticsVO; import com.cyl.manager.ums.domain.vo.MemberDataStatisticsVO; @@ -27,7 +27,7 @@ public interface OrderMapper extends BaseMapper { */ List selectByEntity(Order order); - List selectManagerOrderPage(ManagerOrderQueryRequest request); + List selectManagerOrderPage(ManagerOrderQueryForm request); List orderPage(@Param("status") Integer status, @Param("memberId")Long memberId); 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 e26a8af..90005a4 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 @@ -16,8 +16,8 @@ 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.domain.form.DealWithAftersaleRequest; -import com.cyl.manager.oms.domain.form.ManagerAftersaleOrderRequest; +import com.cyl.manager.oms.domain.form.DealWithAftersaleForm; +import com.cyl.manager.oms.domain.form.ManagerAftersaleOrderForm; import com.cyl.manager.oms.domain.vo.*; import com.cyl.manager.pms.mapper.SkuMapper; import com.cyl.manager.ums.domain.entity.Member; @@ -143,7 +143,7 @@ public class AftersaleService { * @param page 分页条件 * @return 订单售后 */ - public List selectList(ManagerAftersaleOrderRequest query, Pageable page) { + public List selectList(ManagerAftersaleOrderForm query, Pageable page) { if (page != null) { PageHelper.startPage(page.getPageNumber() + 1, page.getPageSize()); } @@ -221,7 +221,7 @@ public class AftersaleService { * @return */ @Transactional - public String dealWith(DealWithAftersaleRequest request, LoginUser user) { + public String dealWith(DealWithAftersaleForm request, LoginUser user) { Order order = orderMapper.selectById(request.getOrderId()); if (order == null){ throw new RuntimeException("无该订单"); 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 18ebab4..b711772 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 @@ -17,8 +17,8 @@ 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.domain.form.DeliverProductRequest; -import com.cyl.manager.oms.domain.form.ManagerOrderQueryRequest; +import com.cyl.manager.oms.domain.form.DeliverProductForm; +import com.cyl.manager.oms.domain.form.ManagerOrderQueryForm; import com.cyl.manager.oms.domain.vo.*; import com.cyl.manager.pms.convert.SkuConvert; import com.cyl.manager.pms.mapper.ProductMapper; @@ -147,7 +147,7 @@ public class OrderService { * @param page 分页条件 * @return 订单表 */ - public PageImpl selectList(ManagerOrderQueryRequest query, Pageable page) { + public PageImpl selectList(ManagerOrderQueryForm query, Pageable page) { if (page != null) { PageHelper.startPage(page.getPageNumber() + 1, page.getPageSize()); } @@ -281,7 +281,7 @@ public class OrderService { * @return 结果 */ @Transactional - public String deliverProduct(DeliverProductRequest request, Long userId) { + public String deliverProduct(DeliverProductForm request, Long userId) { //查询订单 Order order = orderMapper.selectById(request.getOrderId()); QueryWrapper qw = new QueryWrapper<>(); @@ -320,7 +320,7 @@ public class OrderService { * @param userId 操作人 * @param optDate 操作时间 */ - private void createDeliveryHistory(DeliverProductRequest request, Long userId, LocalDateTime optDate){ + private void createDeliveryHistory(DeliverProductForm request, Long userId, LocalDateTime optDate){ OrderDeliveryHistory orderDeliveryHistory = new OrderDeliveryHistory(); orderDeliveryHistory.setOrderId(request.getOrderId()); orderDeliveryHistory.setDeliveryCompany(request.getExpressName()); diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/ums/domain/vo/form/AddMemberCartForm.java b/ruoyi-mall/src/main/java/com/cyl/manager/ums/domain/form/AddMemberCartForm.java similarity index 90% rename from ruoyi-mall/src/main/java/com/cyl/manager/ums/domain/vo/form/AddMemberCartForm.java rename to ruoyi-mall/src/main/java/com/cyl/manager/ums/domain/form/AddMemberCartForm.java index dbd9883..c2ae201 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/ums/domain/vo/form/AddMemberCartForm.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/ums/domain/form/AddMemberCartForm.java @@ -1,4 +1,4 @@ -package com.cyl.manager.ums.domain.vo.form; +package com.cyl.manager.ums.domain.form; import lombok.Data; diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/ums/domain/vo/form/UpdateMemberCartForm.java b/ruoyi-mall/src/main/java/com/cyl/manager/ums/domain/form/UpdateMemberCartForm.java similarity index 91% rename from ruoyi-mall/src/main/java/com/cyl/manager/ums/domain/vo/form/UpdateMemberCartForm.java rename to ruoyi-mall/src/main/java/com/cyl/manager/ums/domain/form/UpdateMemberCartForm.java index 38c135e..fd99583 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/ums/domain/vo/form/UpdateMemberCartForm.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/ums/domain/form/UpdateMemberCartForm.java @@ -1,4 +1,4 @@ -package com.cyl.manager.ums.domain.vo.form; +package com.cyl.manager.ums.domain.form; import lombok.Data; 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 20d8ad5..034c0c9 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 @@ -15,7 +15,7 @@ import com.cyl.manager.ums.mapper.MemberCartMapper; import com.cyl.manager.ums.mapper.MemberMapper; 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.cyl.manager.ums.domain.form.UpdateMemberCartForm; import com.github.pagehelper.PageHelper; import com.ruoyi.common.constant.Constants; import com.ruoyi.common.exception.base.BaseException;