批发下单

netflix-web/src/main/java/com/cyksj/web/controller/manage/goods/GoodsDonWholeSaleController.java

@@ -30,6 +30,7 @@ import java.util.List;
 import java.util.Map;
 
 /**
+ * admin/批发下单
  * 项目名: yhlxj
  * 文件名: GoodsDonWholeSaleController
  * 创建者: JavaZou

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

@@ -32,6 +32,7 @@ import java.util.Map;
 import java.util.Set;
 
 /**
+ * server/批发下单
  * 项目名: yhlxj
  * 文件名: GoodsWholesaleWebControlelr
  * 创建者: JavaZou
@@ -79,17 +80,21 @@ public class GoodsWholesaleWebController {
 		return GatewayResponse.SUCCESS.newBuilder().toResult(list);
 	}
 
+	/**
+	 * 押金支付详情
+	 */
 	@GetMapping("/get/deposit/detail")
-	public Result<String> getUserDepositDetail() {
+	public Result<GoodsWholesaleUserDeposit> getUserDepositDetail() {
 		long userId = StpUserUtil.getLoginIdAsLong();
 		List<Long> userIdList = userBindRelationService.getRelationUserIdList(userId, null);
 		GoodsWholesaleUserDeposit goodsWholesaleUserDeposit = goodsWholesaleUserDepositMapper.selectOne(Wrappers.lambdaQuery(GoodsWholesaleUserDeposit.class)
 				.in(GoodsWholesaleUserDeposit::getUserId, userIdList)
-				.last("limit 1"));
+				.last("limit 1")
+				.select(GoodsWholesaleUserDeposit::getId, GoodsWholesaleUserDeposit::getIsGoal, GoodsWholesaleUserDeposit::getMoney, GoodsWholesaleUserDeposit::getStatus));
 		if (goodsWholesaleUserDeposit == null) {
-			return GatewayResponse.SUCCESS.newBuilder().toResult(GoodsWholesaleUserDeposit.Status.noPayment.name());
+			return GatewayResponse.SUCCESS.newBuilder().toResult(goodsWholesaleUserDeposit);
 		}
-		return GatewayResponse.SUCCESS.newBuilder().toResult(goodsWholesaleUserDeposit.getStatus().name());
+		return GatewayResponse.SUCCESS.newBuilder().toResult(goodsWholesaleUserDeposit);
 	}
 
 	/**