Merge remote-tracking branch 'origin/dev' into dev

blade-service-api/blade-purchase-sales-api/src/main/java/org/springblade/purchase/sales/feign/IOrderCheckClient.java

@@ -1,17 +1,10 @@
 package org.springblade.purchase.sales.feign;
 
-
-import org.springblade.common.constant.LauncherConstant;
 import org.springblade.core.tool.api.R;
-import org.springblade.purchase.sales.entity.Order;
 import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
 
-import javax.validation.Valid;
-
 /**
  * @author caifc
  * @date 2021-10-21 22:28
@@ -19,15 +12,13 @@ import javax.validation.Valid;
 @FeignClient(
 	value = "blade-purchase-sales"
 )
-public interface IOrderCheckClient
-{
+public interface IOrderCheckClient {
 	@PostMapping("/order/passCheck")
 	R passCheck(@RequestParam("id") Long id);
 
 	@PostMapping("/order/passCancel")
 	R passCancel(@RequestParam("id") Long id);
 
-
-	@PostMapping("order/submit")
-	R submit(@Valid @RequestBody Order order);
+	@PostMapping("order/underReview")
+	R underReview(@RequestParam("id") Long id);
 }

blade-service/blade-check/src/main/java/org/springblade/check/service/impl/AuditProecessServiceImpl.java

@@ -628,10 +628,7 @@ public class AuditProecessServiceImpl extends ServiceImpl<AuditProecessMapper, A
 			if (operate == 1) {
 				//如果是第一级, 则修改状态为审批中
 				if (auditProecess.getLevelId() == 1) {
-					Order order = new Order();
-					order.setId(auditProecess.getSrcBillId());
-					order.setStatus(2);
-					R submit = orderCheckClient.submit(order);
+					R submit = orderCheckClient.underReview(auditProecess.getSrcBillId());
 					if (!submit.isSuccess()) {
 						throw new SecurityException("审批开始修改审核状态失败");
 					}

blade-service/blade-land/src/main/java/org/springblade/land/service/impl/OrderItemServiceImpl.java

@@ -618,6 +618,16 @@ public class OrderItemServiceImpl extends ServiceImpl<OrderItemMapper, OrderItem
 	}
 
 	private void sendMsgToUser(OrderItem item, String mold) {
+		if (ObjectUtil.isNotEmpty(item.getFleetId())) {
+			R<CorpsDesc> fleet = corpsDescClient.getCorpMessage(item.getFleetId());
+			if (fleet.isSuccess() && fleet.getData() != null) {
+				item.setFleetName(fleet.getData().getCname());
+			}
+		}
+		if (ObjectUtil.isNotEmpty(item.getDriverId())) {
+			LandDriver driver = landDriverClient.getDriver(item.getDriverId());
+			item.setDriverName(driver.getName());
+		}
 		Order order = orderMapper.selectById(item.getOrderId());
 		if (StringUtil.isNotBlank(order.getAdminProfiles())) {
 			List<String> idList = Arrays.asList(order.getAdminProfiles().split(","));
@@ -629,6 +639,10 @@ public class OrderItemServiceImpl extends ServiceImpl<OrderItemMapper, OrderItem
 	}
 
 	private void sendMsgToFleet(OrderItem item, String mold) {
+		if (ObjectUtil.isNotEmpty(item.getDriverId())) {
+			LandDriver driver = landDriverClient.getDriver(item.getDriverId());
+			item.setDriverName(driver.getName());
+		}
 		List<Long> fleetIdList = corpsDescClient.listUserIdCorpId(item.getFleetId());
 		if (CollectionUtil.isNotEmpty(fleetIdList)) {
 			for (Long fleetId : fleetIdList) {

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/controller/OrderController.java

@@ -634,6 +634,15 @@ public class OrderController extends BladeController {
 	}
 
 	/**
+	 * 审核中
+	 */
+	@PostMapping("/underReview")
+	public R underReview(@ApiParam(value = "主表id", required = true) @RequestParam Long id) {
+		orderService.underReview(id);
+		return R.success("操作成功");
+	}
+
+	/**
 	 * 审核不通过
 	 */
 	@PostMapping("/passCancel")

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/service/IOrderService.java

@@ -102,6 +102,8 @@ public interface IOrderService extends IService<Order> {
 
 	void passCheck(Long id);
 
+	void underReview(Long id);
+
 	void passCancel(Long id);
 
 	void changeAuditUser(Long auditId, String auditUserId);

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/service/impl/OrderServiceImpl.java

@@ -601,7 +601,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 	}
 
 	@Override
-	@Transactional
+	@Transactional(rollbackFor = Exception.class)
 	public void checkOrder(Order order) {
 		Order salesOrder = baseMapper.selectById(order.getId());
 		if (order == null) {
@@ -684,8 +684,8 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 	}
 
 	@Override
-	@Transactional
-	@GlobalTransactional
+	@Transactional(rollbackFor = Exception.class)
+	@GlobalTransactional(rollbackFor = Exception.class)
 	public void passCheck(Long id) {
 
 		/**===========================start 审核通过修改销售订单信息==========================*/
@@ -827,6 +827,16 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 	}
 
 	@Override
+	public void underReview(Long id) {
+		Order order = baseMapper.selectById(id);
+		if (order == null) {
+			throw new SecurityException("审批驳回失败");
+		}
+		order.setStatus(0);
+		baseMapper.updateById(order);
+	}
+
+	@Override
 	public void passCancel(Long id) {
 		LambdaQueryWrapper<Order> orderLambdaQueryWrapper = new LambdaQueryWrapper<>();
 		orderLambdaQueryWrapper
@@ -860,7 +870,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 	 * @return
 	 */
 	@Override
-	@GlobalTransactional
+	@GlobalTransactional(rollbackFor = Exception.class)
 	@Transactional(rollbackFor = Exception.class)
 	public R dealerSubmit(Order order) {
 		// dealer 1 确认订单 2 取消订单