From 74a4448931b898398e1a51b975349430b092b62e Mon Sep 17 00:00:00 2001 From: zhh Date: Wed, 17 Oct 2018 14:45:40 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=94=B3=E8=AF=B7=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mall/portal/config/SecurityConfig.java | 4 +- .../OmsPortalOrderReturnApplyController.java | 36 ++++++++++++++ .../domain/OmsOrderReturnApplyParam.java | 49 +++++++++++++++++++ .../OmsPortalOrderReturnApplyService.java | 14 ++++++ .../OmsPortalOrderReturnApplyServiceImpl.java | 29 +++++++++++ 5 files changed, 130 insertions(+), 2 deletions(-) create mode 100644 mall-portal/src/main/java/com/macro/mall/portal/controller/OmsPortalOrderReturnApplyController.java create mode 100644 mall-portal/src/main/java/com/macro/mall/portal/domain/OmsOrderReturnApplyParam.java create mode 100644 mall-portal/src/main/java/com/macro/mall/portal/service/OmsPortalOrderReturnApplyService.java create mode 100644 mall-portal/src/main/java/com/macro/mall/portal/service/impl/OmsPortalOrderReturnApplyServiceImpl.java diff --git a/mall-portal/src/main/java/com/macro/mall/portal/config/SecurityConfig.java b/mall-portal/src/main/java/com/macro/mall/portal/config/SecurityConfig.java index 927dcff..61dfa7b 100644 --- a/mall-portal/src/main/java/com/macro/mall/portal/config/SecurityConfig.java +++ b/mall-portal/src/main/java/com/macro/mall/portal/config/SecurityConfig.java @@ -45,8 +45,8 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter { .permitAll() .antMatchers("/sso/*")// 对登录注册要允许匿名访问 .permitAll() -// .antMatchers("/member/**")// 测试mongo时开启 -// .permitAll() + .antMatchers("/member/**","/returnApply/**")// 测试时开启 + .permitAll() .anyRequest()// 除上面外的所有请求全部需要鉴权认证 .authenticated() .and() diff --git a/mall-portal/src/main/java/com/macro/mall/portal/controller/OmsPortalOrderReturnApplyController.java b/mall-portal/src/main/java/com/macro/mall/portal/controller/OmsPortalOrderReturnApplyController.java new file mode 100644 index 0000000..0cda83d --- /dev/null +++ b/mall-portal/src/main/java/com/macro/mall/portal/controller/OmsPortalOrderReturnApplyController.java @@ -0,0 +1,36 @@ +package com.macro.mall.portal.controller; + +import com.macro.mall.portal.domain.CommonResult; +import com.macro.mall.portal.domain.OmsOrderReturnApplyParam; +import com.macro.mall.portal.service.OmsPortalOrderReturnApplyService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.ResponseBody; + +/** + * 申请退货管理Controller + * Created by macro on 2018/10/17. + */ +@Controller +@Api(tags = "OmsPortalOrderReturnApplyController", description = "申请退货管理") +@RequestMapping("/returnApply") +public class OmsPortalOrderReturnApplyController { + @Autowired + private OmsPortalOrderReturnApplyService returnApplyService; + + @ApiOperation("申请退货") + @RequestMapping(value = "/create", method = RequestMethod.POST) + @ResponseBody + public Object create(@RequestBody OmsOrderReturnApplyParam returnApply) { + int count = returnApplyService.create(returnApply); + if (count > 0) { + return new CommonResult().success(count); + } + return new CommonResult().failed(); + } +} diff --git a/mall-portal/src/main/java/com/macro/mall/portal/domain/OmsOrderReturnApplyParam.java b/mall-portal/src/main/java/com/macro/mall/portal/domain/OmsOrderReturnApplyParam.java new file mode 100644 index 0000000..f2f82ba --- /dev/null +++ b/mall-portal/src/main/java/com/macro/mall/portal/domain/OmsOrderReturnApplyParam.java @@ -0,0 +1,49 @@ +package com.macro.mall.portal.domain; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Getter; +import lombok.Setter; + +import java.math.BigDecimal; + +/** + * 申请退货参数 + * Created by macro on 2018/10/17. + */ +@Getter +@Setter +public class OmsOrderReturnApplyParam { + @ApiModelProperty("订单id") + private Long orderId; + @ApiModelProperty("退货商品id") + private Long productId; + @ApiModelProperty("订单编号") + private String orderSn; + @ApiModelProperty("会员用户名") + private String memberUsername; + @ApiModelProperty("退货人姓名") + private String returnName; + @ApiModelProperty("退货人电话") + private String returnPhone; + @ApiModelProperty("商品图片") + private String productPic; + @ApiModelProperty("商品名称") + private String productName; + @ApiModelProperty("商品品牌") + private String productBrand; + @ApiModelProperty("商品销售属性：颜色：红色；尺码：xl;") + private String productAttr; + @ApiModelProperty("退货数量") + private Integer productCount; + @ApiModelProperty("商品单价") + private BigDecimal productPrice; + @ApiModelProperty("商品实际支付单价") + private BigDecimal productRealPrice; + @ApiModelProperty("原因") + private String reason; + @ApiModelProperty("描述") + private String description; + @ApiModelProperty("凭证图片，以逗号隔开") + private String proofPics; + +} diff --git a/mall-portal/src/main/java/com/macro/mall/portal/service/OmsPortalOrderReturnApplyService.java b/mall-portal/src/main/java/com/macro/mall/portal/service/OmsPortalOrderReturnApplyService.java new file mode 100644 index 0000000..bf3d0c3 --- /dev/null +++ b/mall-portal/src/main/java/com/macro/mall/portal/service/OmsPortalOrderReturnApplyService.java @@ -0,0 +1,14 @@ +package com.macro.mall.portal.service; + +import com.macro.mall.portal.domain.OmsOrderReturnApplyParam; + +/** + * 订单退货管理Service + * Created by macro on 2018/10/17. + */ +public interface OmsPortalOrderReturnApplyService { + /** + * 提交申请 + */ + int create(OmsOrderReturnApplyParam returnApply); +} diff --git a/mall-portal/src/main/java/com/macro/mall/portal/service/impl/OmsPortalOrderReturnApplyServiceImpl.java b/mall-portal/src/main/java/com/macro/mall/portal/service/impl/OmsPortalOrderReturnApplyServiceImpl.java new file mode 100644 index 0000000..88f4d2e --- /dev/null +++ b/mall-portal/src/main/java/com/macro/mall/portal/service/impl/OmsPortalOrderReturnApplyServiceImpl.java @@ -0,0 +1,29 @@ +package com.macro.mall.portal.service.impl; + +import com.macro.mall.mapper.OmsOrderReturnApplyMapper; +import com.macro.mall.model.OmsOrderReturnApply; +import com.macro.mall.portal.domain.OmsOrderReturnApplyParam; +import com.macro.mall.portal.service.OmsPortalOrderReturnApplyService; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.Date; + +/** + * 订单退货管理Service实现类 + * Created by macro on 2018/10/17. + */ +@Service +public class OmsPortalOrderReturnApplyServiceImpl implements OmsPortalOrderReturnApplyService { + @Autowired + private OmsOrderReturnApplyMapper returnApplyMapper; + @Override + public int create(OmsOrderReturnApplyParam returnApply) { + OmsOrderReturnApply realApply = new OmsOrderReturnApply(); + BeanUtils.copyProperties(returnApply,realApply); + realApply.setCreateTime(new Date()); + realApply.setStatus(0); + return returnApplyMapper.insert(realApply); + } +}