bonus
/
Bonus-Cloud-Material-Mall
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

功能需求优化

This commit is contained in:
mashuai 2025-03-10 10:48:40 +08:00
parent a8a64cc426
commit e002af3c3a
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/controller/OrderController.java
View File

@ -11,6 +11,7 @@ import com.bonus.common.core.web.domain.AjaxResult;
import com.bonus.common.core.web.page.TableDataInfo;
import com.bonus.common.security.utils.SecurityUtils;
import com.bonus.material.basic.mapper.BmMessageMapper;
import com.bonus.material.common.annotation.PreventRepeatSubmit;
import com.bonus.material.contract.domain.BmContract;
import com.bonus.material.contract.service.BmContractService;
import com.bonus.material.lease.domain.DeptDto;
@ -140,6 +141,7 @@ public class OrderController extends BaseController {
* 订单状态流转修改
*/
@ApiOperation(value = "订单状态流转修改")
@PreventRepeatSubmit
@PostMapping("/updateOrderStatus")
public AjaxResult updateOrderStatus(@RequestBody OrderDetailDto orderInfoDto) {
if (orderInfoDto.getOrderId() == null || StringUtils.isBlank(orderInfoDto.getOrderStatus())) {

4
bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/service/impl/OrderServiceImpl.java
View File

@ -295,8 +295,8 @@ public class OrderServiceImpl implements OrderService {
// 存储redis中
redisService.setCacheObject(MaterialConstants.DICT_TYPE_ORDER_PICKUP_CODE + orderInfoDto.getOrderId(), code);
}
// 针对于收货操作，校验6位数取件码是否正确
if (orderInfoDto.getOrderStatus().equals(OrderStatusEnum.ORDER_AWAITING_RECEIPT.getStatus().toString())) {
// 针对于出库操作，校验6位数取件码是否正确
if (orderInfoDto.getOrderStatus().equals(OrderStatusEnum.ORDER_PENDING_SHIPMENT.getStatus().toString())) {
if (StringUtils.isBlank(orderInfoDto.getPickupCode())){
throw new ServiceException("取件码不能为空");
}