caojiahao/dev_caojiahao
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop

Browse Source
This commit is contained in:
lifenlong 2021-08-12 00:35:50 +08:00
commit 8532400b82
4 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
framework/src/main/java/cn/lili/common/enums/ResultCode.java
View File

@ -213,6 +213,7 @@ public enum ResultCode {
COMPLAINT_NOT_EXIT(33103, "当前投诉记录不存在"), COMPLAINT_NOT_EXIT(33103, "当前投诉记录不存在"),
COMPLAINT_ARBITRATION_RESULT_ERROR(33104, "结束订单投诉时，仲裁结果不能为空"), COMPLAINT_ARBITRATION_RESULT_ERROR(33104, "结束订单投诉时，仲裁结果不能为空"),
COMPLAINT_APPEAL_CONTENT_ERROR(33105, "商家申诉时，申诉内容不能为空"), COMPLAINT_APPEAL_CONTENT_ERROR(33105, "商家申诉时，申诉内容不能为空"),
COMPLAINT_CANCEL_ERROR(33106, "申诉已完成，不需要进行取消申诉操作"),
/** /**

5
framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderComplaintServiceImpl.java
View File

@ -214,6 +214,11 @@ public class OrderComplaintServiceImpl extends ServiceImpl<OrderComplaintMapper,
@Override @Override
public boolean cancel(String id) { public boolean cancel(String id) {
OrderComplaint orderComplaint = this.getById(id);
//如果以及仲裁，则不可以进行申诉取消
if(orderComplaint.getComplainStatus().equals(ComplaintStatusEnum.COMPLETE.name())){
throw new ServiceException(ResultCode.COMPLAINT_CANCEL_ERROR);
}
LambdaUpdateWrapper<OrderComplaint> lambdaUpdateWrapper = Wrappers.lambdaUpdate(); LambdaUpdateWrapper<OrderComplaint> lambdaUpdateWrapper = Wrappers.lambdaUpdate();
lambdaUpdateWrapper.eq(OrderComplaint::getId, id); lambdaUpdateWrapper.eq(OrderComplaint::getId, id);
lambdaUpdateWrapper.set(OrderComplaint::getComplainStatus, ComplaintStatusEnum.CANCEL.name()); lambdaUpdateWrapper.set(OrderComplaint::getComplainStatus, ComplaintStatusEnum.CANCEL.name());

9
manager-api/src/main/java/cn/lili/controller/trade/OrderManagerController.java
View File

@ -20,6 +20,7 @@ import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore; import springfox.documentation.annotations.ApiIgnore;
import javax.validation.Valid; import javax.validation.Valid;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
import java.util.List; import java.util.List;
@ -106,4 +107,12 @@ public class OrderManagerController {
} }
@ApiOperation(value = "查询物流踪迹")
@ApiImplicitParams({
@ApiImplicitParam(name = "orderSn", value = "订单编号", required = true, dataType = "String", paramType = "path")
})
@PostMapping(value = "/getTraces/{orderSn}")
public ResultMessage<Object> getTraces(@NotBlank(message = "订单编号不能为空") @PathVariable String orderSn) {
return ResultUtil.data(orderService.getTraces(orderSn));
}
} }

3
seller-api/src/main/java/cn/lili/controller/trade/OrderComplaintStoreController.java
View File

@ -71,10 +71,9 @@ public class OrderComplaintStoreController {
@ApiOperation(value = "修改申诉信息") @ApiOperation(value = "修改申诉信息")
@PutMapping @PutMapping
public ResultMessage<OrderComplaintVO> update(OrderComplaintVO orderComplainVO) { public ResultMessage<OrderComplaintVO> update(OrderComplaintVO orderComplainVO) {
orderComplainVO.setStoreId(UserContext.getCurrentUser().getId()); orderComplainVO.setStoreId(UserContext.getCurrentUser().getStoreId());
orderComplaintService.updateOrderComplain(orderComplainVO); orderComplaintService.updateOrderComplain(orderComplainVO);
return ResultUtil.data(orderComplainVO); return ResultUtil.data(orderComplainVO);
} }
@ApiOperation(value = "申诉") @ApiOperation(value = "申诉")