zoujiajian 1 年之前
父節點
當前提交
fbf6ae6c3c

+ 2 - 0
netflix-service/src/main/java/com/cyksj/service/order/GoodsWholesalePayService.java

@@ -28,4 +28,6 @@ public interface GoodsWholesalePayService {
 	void aliPayWholesaleDepositNotify(Map<String, String> params) throws Exception;
 
 	void closeWholesaleOrder(Long orderId, long userId);
+
+	Object getOrderStatus(Long userId, Integer type, Long orderId);
 }

+ 17 - 0
netflix-service/src/main/java/com/cyksj/service/order/impl/GoodsWholesalePayServiceImpl.java

@@ -339,6 +339,23 @@ public class GoodsWholesalePayServiceImpl implements GoodsWholesalePayService {
 		goodsWholesaleOrderDonMapper.updateById(orderDon);
 	}
 
+	@Override
+	public Object getOrderStatus(Long userId, Integer type, Long orderId) {
+		List<Long> userIdList = userBindRelationService.getRelationUserIdList(userId, null);
+		if (type == 1) {
+			GoodsWholesaleUserDeposit goodsWholesaleUserDeposit = depositMapper.selectOne(Wrappers.lambdaQuery(GoodsWholesaleUserDeposit.class)
+					.in(GoodsWholesaleUserDeposit::getUserId, userIdList)
+					.eq(GoodsWholesaleUserDeposit::getId, orderId)
+					.last("limit 1"));
+			return goodsWholesaleUserDeposit;
+		}
+		GoodsWholesaleOrderDon orderDon = goodsWholesaleOrderDonMapper.selectOne(Wrappers.lambdaQuery(GoodsWholesaleOrderDon.class)
+				.in(GoodsWholesaleOrderDon::getUserId, userIdList)
+				.eq(GoodsWholesaleOrderDon::getId, orderId)
+				.last("limit 1"));
+		return orderDon;
+	}
+
 
 	/**
 	 * 退还押金

+ 10 - 0
netflix-web/src/main/java/com/cyksj/web/controller/wholesale/GoodsWholesaleWebController.java

@@ -237,6 +237,16 @@ public class GoodsWholesaleWebController {
 		return "success";
 	}
 
+	/**
+	 * 查询订单状态
+	 */
+	@GetMapping("/get/order/status/{orderId}")
+	public Result<Object> getOrderStatus(@RequestParam(defaultValue = "2") Integer type, @PathVariable Long orderId) {
+		long userId = StpUserUtil.getLoginIdAsLong();
+		Object o = goodsWholesalePayService.getOrderStatus(userId, type, orderId);
+		return GatewayResponse.SUCCESS.newBuilder().toResult(o);
+	}
+
 	/**
 	 * 批发订单列表
 	 */