From 7054e92cf45205ab4a3d17c40757e55eb8387ab7 Mon Sep 17 00:00:00 2001 From: zhh Date: Thu, 18 Oct 2018 14:37:04 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=80=80=E8=B4=A7=E7=94=B3?= =?UTF-8?q?=E8=AF=B7=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../OmsCompanyAddressController.java | 34 ++++++++ .../OmsOrderReturnApplyController.java | 68 ++++++++++++++++ .../mall/dao/OmsOrderReturnApplyDao.java | 24 ++++++ .../mall/dto/OmsOrderReturnApplyResult.java | 16 ++++ .../mall/dto/OmsReturnApplyQueryParam.java | 26 +++++++ .../macro/mall/dto/OmsUpdateStatusParam.java | 32 ++++++++ .../service/OmsCompanyAddressService.java | 16 ++++ .../service/OmsOrderReturnApplyService.java | 34 ++++++++ .../impl/OmsCompanyAddressServiceImpl.java | 24 ++++++ .../impl/OmsOrderReturnApplyServiceImpl.java | 78 +++++++++++++++++++ .../resources/dao/OmsOrderReturnApplyDao.xml | 59 ++++++++++++++ 11 files changed, 411 insertions(+) create mode 100644 mall-admin/src/main/java/com/macro/mall/controller/OmsCompanyAddressController.java create mode 100644 mall-admin/src/main/java/com/macro/mall/controller/OmsOrderReturnApplyController.java create mode 100644 mall-admin/src/main/java/com/macro/mall/dao/OmsOrderReturnApplyDao.java create mode 100644 mall-admin/src/main/java/com/macro/mall/dto/OmsOrderReturnApplyResult.java create mode 100644 mall-admin/src/main/java/com/macro/mall/dto/OmsReturnApplyQueryParam.java create mode 100644 mall-admin/src/main/java/com/macro/mall/dto/OmsUpdateStatusParam.java create mode 100644 mall-admin/src/main/java/com/macro/mall/service/OmsCompanyAddressService.java create mode 100644 mall-admin/src/main/java/com/macro/mall/service/OmsOrderReturnApplyService.java create mode 100644 mall-admin/src/main/java/com/macro/mall/service/impl/OmsCompanyAddressServiceImpl.java create mode 100644 mall-admin/src/main/java/com/macro/mall/service/impl/OmsOrderReturnApplyServiceImpl.java create mode 100644 mall-admin/src/main/resources/dao/OmsOrderReturnApplyDao.xml diff --git a/mall-admin/src/main/java/com/macro/mall/controller/OmsCompanyAddressController.java b/mall-admin/src/main/java/com/macro/mall/controller/OmsCompanyAddressController.java new file mode 100644 index 0000000..d3dba70 --- /dev/null +++ b/mall-admin/src/main/java/com/macro/mall/controller/OmsCompanyAddressController.java @@ -0,0 +1,34 @@ +package com.macro.mall.controller; + +import com.macro.mall.dto.CommonResult; +import com.macro.mall.model.OmsCompanyAddress; +import com.macro.mall.service.OmsCompanyAddressService; +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.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.ResponseBody; + +import java.util.List; + +/** + * 收货地址管理Controller + * Created by macro on 2018/10/18. + */ +@Controller +@Api(tags = "OmsCompanyAddressController", description = "收货地址管理") +@RequestMapping("/companyAddress") +public class OmsCompanyAddressController { + @Autowired + private OmsCompanyAddressService companyAddressService; + + @ApiOperation("获取所有收货地址") + @RequestMapping(value = "/list",method = RequestMethod.GET) + @ResponseBody + public Object list() { + List companyAddressList = companyAddressService.list(); + return new CommonResult().success(companyAddressList); + } +} diff --git a/mall-admin/src/main/java/com/macro/mall/controller/OmsOrderReturnApplyController.java b/mall-admin/src/main/java/com/macro/mall/controller/OmsOrderReturnApplyController.java new file mode 100644 index 0000000..a8dfb06 --- /dev/null +++ b/mall-admin/src/main/java/com/macro/mall/controller/OmsOrderReturnApplyController.java @@ -0,0 +1,68 @@ +package com.macro.mall.controller; + +import com.macro.mall.dto.CommonResult; +import com.macro.mall.dto.OmsOrderReturnApplyResult; +import com.macro.mall.dto.OmsReturnApplyQueryParam; +import com.macro.mall.dto.OmsUpdateStatusParam; +import com.macro.mall.model.OmsOrderReturnApply; +import com.macro.mall.service.OmsOrderReturnApplyService; +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.*; + +import java.util.List; + +/** + * 订单退货申请管理 + * Created by macro on 2018/10/18. + */ +@Controller +@Api(tags = "OmsOrderReturnApplyController", description = "订单退货申请管理") +@RequestMapping("/returnApply") +public class OmsOrderReturnApplyController { + @Autowired + private OmsOrderReturnApplyService returnApplyService; + + @ApiOperation("分页查询退货申请") + @RequestMapping(value = "/list", method = RequestMethod.GET) + @ResponseBody + public Object list(OmsReturnApplyQueryParam queryParam, + @RequestParam(value = "pageSize", defaultValue = "5") Integer pageSize, + @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum) { + List returnApplyList = returnApplyService.list(queryParam, pageSize, pageNum); + return new CommonResult().pageSuccess(returnApplyList); + } + + @ApiOperation("批量删除申请") + @RequestMapping(value = "/delete", method = RequestMethod.POST) + @ResponseBody + public Object delete(@RequestParam("ids") List ids) { + int count = returnApplyService.delete(ids); + if (count > 0) { + return new CommonResult().success(count); + } + return new CommonResult().failed(); + } + + @ApiOperation("获取退货申请详情") + @RequestMapping(value = "/{id}", method = RequestMethod.GET) + @ResponseBody + public Object getItem(@PathVariable Long id) { + OmsOrderReturnApplyResult result = returnApplyService.getItem(id); + return new CommonResult().success(result); + } + + @ApiOperation("修改申请状态") + @RequestMapping(value = "/update/status/{id}", method = RequestMethod.POST) + @ResponseBody + public Object updateStatus(@PathVariable Long id, @RequestBody OmsUpdateStatusParam statusParam) { + int count = returnApplyService.updateStatus(id, statusParam); + if (count > 0) { + return new CommonResult().success(count); + } + return new CommonResult().failed(); + } + +} diff --git a/mall-admin/src/main/java/com/macro/mall/dao/OmsOrderReturnApplyDao.java b/mall-admin/src/main/java/com/macro/mall/dao/OmsOrderReturnApplyDao.java new file mode 100644 index 0000000..0c82b3b --- /dev/null +++ b/mall-admin/src/main/java/com/macro/mall/dao/OmsOrderReturnApplyDao.java @@ -0,0 +1,24 @@ +package com.macro.mall.dao; + +import com.macro.mall.dto.OmsOrderReturnApplyResult; +import com.macro.mall.dto.OmsReturnApplyQueryParam; +import com.macro.mall.model.OmsOrderReturnApply; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 订单退货申请自定义Dao + * Created by macro on 2018/10/18. + */ +public interface OmsOrderReturnApplyDao { + /** + * 查询申请列表 + */ + List getList(@Param("queryParam") OmsReturnApplyQueryParam queryParam); + + /** + * 获取申请详情 + */ + OmsOrderReturnApplyResult getDetail(@Param("id")Long id); +} diff --git a/mall-admin/src/main/java/com/macro/mall/dto/OmsOrderReturnApplyResult.java b/mall-admin/src/main/java/com/macro/mall/dto/OmsOrderReturnApplyResult.java new file mode 100644 index 0000000..4d77fdd --- /dev/null +++ b/mall-admin/src/main/java/com/macro/mall/dto/OmsOrderReturnApplyResult.java @@ -0,0 +1,16 @@ +package com.macro.mall.dto; + +import com.macro.mall.model.OmsCompanyAddress; +import com.macro.mall.model.OmsOrderReturnApply; +import lombok.Getter; +import lombok.Setter; + +/** + * 申请信息封装 + * Created by macro on 2018/10/18. + */ +public class OmsOrderReturnApplyResult extends OmsOrderReturnApply { + @Getter + @Setter + private OmsCompanyAddress companyAddress; +} diff --git a/mall-admin/src/main/java/com/macro/mall/dto/OmsReturnApplyQueryParam.java b/mall-admin/src/main/java/com/macro/mall/dto/OmsReturnApplyQueryParam.java new file mode 100644 index 0000000..022cb46 --- /dev/null +++ b/mall-admin/src/main/java/com/macro/mall/dto/OmsReturnApplyQueryParam.java @@ -0,0 +1,26 @@ +package com.macro.mall.dto; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Getter; +import lombok.Setter; + +/** + * 订单退货申请查询参数 + * Created by macro on 2018/10/18. + */ +@Getter +@Setter +public class OmsReturnApplyQueryParam { + @ApiModelProperty("服务单号") + private Long id; + @ApiModelProperty(value = "收货人姓名/号码") + private String receiverKeyword; + @ApiModelProperty(value = "申请状态：0->待处理；1->退货中；2->已完成；3->已拒绝") + private Integer status; + @ApiModelProperty(value = "申请时间") + private String createTime; + @ApiModelProperty(value = "处理人员") + private String handleMan; + @ApiModelProperty(value = "处理时间") + private String handleTime; +} diff --git a/mall-admin/src/main/java/com/macro/mall/dto/OmsUpdateStatusParam.java b/mall-admin/src/main/java/com/macro/mall/dto/OmsUpdateStatusParam.java new file mode 100644 index 0000000..597408a --- /dev/null +++ b/mall-admin/src/main/java/com/macro/mall/dto/OmsUpdateStatusParam.java @@ -0,0 +1,32 @@ +package com.macro.mall.dto; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Getter; +import lombok.Setter; + +import java.math.BigDecimal; + +/** + * 确认收货提交参数 + * Created by macro on 2018/10/18. + */ +@Getter +@Setter +public class OmsUpdateStatusParam { + @ApiModelProperty("服务单号") + private Long id; + @ApiModelProperty("收货地址关联id") + private Long companyAddressId; + @ApiModelProperty("确认退款金额") + private BigDecimal returnAmount; + @ApiModelProperty("处理备注") + private String handleNote; + @ApiModelProperty("处理人") + private String handleMan; + @ApiModelProperty("收货备注") + private String receiveNote; + @ApiModelProperty("收货人") + private String receiveMan; + @ApiModelProperty("申请状态：1->退货中；2->已完成；3->已拒绝") + private Integer status; +} diff --git a/mall-admin/src/main/java/com/macro/mall/service/OmsCompanyAddressService.java b/mall-admin/src/main/java/com/macro/mall/service/OmsCompanyAddressService.java new file mode 100644 index 0000000..d8f9ac6 --- /dev/null +++ b/mall-admin/src/main/java/com/macro/mall/service/OmsCompanyAddressService.java @@ -0,0 +1,16 @@ +package com.macro.mall.service; + +import com.macro.mall.model.OmsCompanyAddress; + +import java.util.List; + +/** + * 收货地址管Service + * Created by macro on 2018/10/18. + */ +public interface OmsCompanyAddressService { + /** + * 获取全部收货地址 + */ + List list(); +} diff --git a/mall-admin/src/main/java/com/macro/mall/service/OmsOrderReturnApplyService.java b/mall-admin/src/main/java/com/macro/mall/service/OmsOrderReturnApplyService.java new file mode 100644 index 0000000..597744e --- /dev/null +++ b/mall-admin/src/main/java/com/macro/mall/service/OmsOrderReturnApplyService.java @@ -0,0 +1,34 @@ +package com.macro.mall.service; + +import com.macro.mall.dto.OmsOrderReturnApplyResult; +import com.macro.mall.dto.OmsReturnApplyQueryParam; +import com.macro.mall.dto.OmsUpdateStatusParam; +import com.macro.mall.model.OmsOrderReturnApply; + +import java.util.List; + +/** + * 退货申请管理Service + * Created by macro on 2018/10/18. + */ +public interface OmsOrderReturnApplyService { + /** + * 分页查询申请 + */ + List list(OmsReturnApplyQueryParam queryParam, Integer pageSize, Integer pageNum); + + /** + * 批量删除申请 + */ + int delete(List ids); + + /** + * 修改申请状态 + */ + int updateStatus(Long id, OmsUpdateStatusParam statusParam); + + /** + * 获取指定申请详情 + */ + OmsOrderReturnApplyResult getItem(Long id); +} diff --git a/mall-admin/src/main/java/com/macro/mall/service/impl/OmsCompanyAddressServiceImpl.java b/mall-admin/src/main/java/com/macro/mall/service/impl/OmsCompanyAddressServiceImpl.java new file mode 100644 index 0000000..fc2d2fe --- /dev/null +++ b/mall-admin/src/main/java/com/macro/mall/service/impl/OmsCompanyAddressServiceImpl.java @@ -0,0 +1,24 @@ +package com.macro.mall.service.impl; + +import com.macro.mall.mapper.OmsCompanyAddressMapper; +import com.macro.mall.model.OmsCompanyAddress; +import com.macro.mall.model.OmsCompanyAddressExample; +import com.macro.mall.service.OmsCompanyAddressService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * 收货地址管理Service实现类 + * Created by macro on 2018/10/18. + */ +@Service +public class OmsCompanyAddressServiceImpl implements OmsCompanyAddressService { + @Autowired + private OmsCompanyAddressMapper companyAddressMapper; + @Override + public List list() { + return companyAddressMapper.selectByExample(new OmsCompanyAddressExample()); + } +} diff --git a/mall-admin/src/main/java/com/macro/mall/service/impl/OmsOrderReturnApplyServiceImpl.java b/mall-admin/src/main/java/com/macro/mall/service/impl/OmsOrderReturnApplyServiceImpl.java new file mode 100644 index 0000000..2773a9c --- /dev/null +++ b/mall-admin/src/main/java/com/macro/mall/service/impl/OmsOrderReturnApplyServiceImpl.java @@ -0,0 +1,78 @@ +package com.macro.mall.service.impl; + +import com.github.pagehelper.PageHelper; +import com.macro.mall.dao.OmsOrderReturnApplyDao; +import com.macro.mall.dto.OmsOrderReturnApplyResult; +import com.macro.mall.dto.OmsReturnApplyQueryParam; +import com.macro.mall.dto.OmsUpdateStatusParam; +import com.macro.mall.mapper.OmsOrderReturnApplyMapper; +import com.macro.mall.model.OmsOrderReturnApply; +import com.macro.mall.model.OmsOrderReturnApplyExample; +import com.macro.mall.service.OmsOrderReturnApplyService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.Date; +import java.util.List; + +/** + * 订单退货管理Service + * Created by macro on 2018/10/18. + */ +@Service +public class OmsOrderReturnApplyServiceImpl implements OmsOrderReturnApplyService { + @Autowired + private OmsOrderReturnApplyDao returnApplyDao; + @Autowired + private OmsOrderReturnApplyMapper returnApplyMapper; + @Override + public List list(OmsReturnApplyQueryParam queryParam, Integer pageSize, Integer pageNum) { + PageHelper.startPage(pageNum,pageSize); + return returnApplyDao.getList(queryParam); + } + + @Override + public int delete(List ids) { + OmsOrderReturnApplyExample example = new OmsOrderReturnApplyExample(); + example.createCriteria().andIdIn(ids).andStatusEqualTo(3); + return returnApplyMapper.deleteByExample(example); + } + + @Override + public int updateStatus(Long id, OmsUpdateStatusParam statusParam) { + Integer status = statusParam.getStatus(); + OmsOrderReturnApply returnApply = new OmsOrderReturnApply(); + if(status.equals(1)){ + //确认退货 + returnApply.setId(statusParam.getId()); + returnApply.setStatus(1); + returnApply.setReturnAmount(statusParam.getReturnAmount()); + returnApply.setCompanyAddressId(statusParam.getCompanyAddressId()); + returnApply.setHandleTime(new Date()); + returnApply.setHandleMan(statusParam.getHandleMan()); + returnApply.setHandleNote(statusParam.getHandleNote()); + }else if(status.equals(2)){ + //完成退货 + returnApply.setId(statusParam.getId()); + returnApply.setStatus(2); + returnApply.setReceiveTime(new Date()); + returnApply.setReceiveMan(statusParam.getReceiveMan()); + returnApply.setReceiveNote(statusParam.getReceiveNote()); + }else if(status.equals(3)){ + //拒绝退货 + returnApply.setId(statusParam.getId()); + returnApply.setStatus(3); + returnApply.setHandleTime(new Date()); + returnApply.setHandleMan(statusParam.getHandleMan()); + returnApply.setHandleNote(statusParam.getHandleNote()); + }else{ + return 0; + } + return returnApplyMapper.updateByPrimaryKeySelective(returnApply); + } + + @Override + public OmsOrderReturnApplyResult getItem(Long id) { + return returnApplyDao.getDetail(id); + } +} diff --git a/mall-admin/src/main/resources/dao/OmsOrderReturnApplyDao.xml b/mall-admin/src/main/resources/dao/OmsOrderReturnApplyDao.xml new file mode 100644 index 0000000..971e741 --- /dev/null +++ b/mall-admin/src/main/resources/dao/OmsOrderReturnApplyDao.xml @@ -0,0 +1,59 @@ + + + + + + + + + \ No newline at end of file