特殊账户付款

src/main/java/org/springblade/modules/api/controller/AliPay01Controller.java

@@ -26,6 +26,7 @@ import org.springblade.common.utils.CommonUtil;
 import org.springblade.common.utils.NotifyUtils;
 import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.log.annotation.ApiLog;
+import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.log.logger.BladeLogger;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.DateUtil;
@@ -243,6 +244,10 @@ public class AliPay01Controller extends BladeController {
 		if (ObjectUtil.isNull(query)){
 			return R.fail("该用户不存在！");
 		}
+		boolean flg = UserAppWrapper.build().isTicket(query.getTicket(), price);
+		if (!flg){
+			return R.fail("您的绿色积分不足！");
+		}
 		if (query.getEnableAuth() != 2){
 			double k = (double)query.getCreditScore() / 100;
 			int scoreCount = NumberUtil.roundDown(k, 2).intValue();
@@ -257,10 +262,6 @@ public class AliPay01Controller extends BladeController {
 		if(query.getState() != 1 ){
 			return R.fail("该账号已冻结！");
 		}
-		boolean flg = UserAppWrapper.build().isTicket(query.getTicket(), price);
-		if (!flg){
-			return R.fail("您的绿色积分不足！");
-		}
 		Consign consign = consignService.queryConsign(batNo, userId);
 		if (ObjectUtil.isNull(consign)){
 			return R.fail("亲，好物已抢完欢迎再来！");

src/main/java/org/springblade/modules/api/controller/Api05Controller.java

@@ -41,6 +41,7 @@ import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.StringUtil;
 import org.springblade.core.tool.utils.WebUtil;
+import org.springblade.modules.api.request.ConsignPayRequest;
 import org.springblade.modules.api.request.OrderCommonSaveRequest;
 import org.springblade.modules.api.request.OrderConsignRandomRequest;
 import org.springblade.modules.api.request.OrderTakeRequest;
@@ -175,6 +176,58 @@ public class Api05Controller extends BladeController {
 		return R.data(response);
 	}
 
+	@PostMapping("checkConsignPay")
+	@ApiOperation(value = "确认付款id")
+	public R checkConsignPay(@RequestBody ConsignPayRequest payRequest){
+
+		return R.success("确认付款成功");
+	}
+
+	/**
+	 *
+	 * @return
+	 */
+	@PostMapping("getConsignListByConfigId")
+	@ApiOperation(value = "查询场次付款记录")
+	public R<List<Consign>> getConsignListByConfigId(@ApiParam(value = "批次ID", required = true) @RequestParam Long consignConfigId){
+		LambdaQueryWrapper<Consign> query = Wrappers.lambdaQuery(Consign.class);
+		query.eq(Consign::getConsignConfigId,consignConfigId);
+		query.eq(Consign::getConsignState, 2);
+		List<Consign> list = consignService.list(query);
+		return R.data(list);
+	}
+
+	/**
+	 *
+	 * @return
+	 */
+	@PostMapping("getConsignALLList")
+	@ApiOperation(value = "查询付款授权场次")
+	public R<List<ConsignListVO>> getConsignALLList(){
+		//查询已授权表记录
+		LambdaQueryWrapper<PlatformAuthorization> query = Wrappers.lambdaQuery(PlatformAuthorization.class);
+		query.eq(PlatformAuthorization::getState, 1);
+		List<PlatformAuthorization> platformAuthorizations = paMapper.selectList(query);
+		LambdaQueryWrapper<Consign> consignLambdaQueryWrapper = Wrappers.lambdaQuery(Consign.class);
+		consignLambdaQueryWrapper.eq(Consign::getNowStock, 0).eq(Consign::getConsignState, 2);
+		List<Consign> list = consignService.list(consignLambdaQueryWrapper);
+		ConsignListVO consignListVO = null;
+		List<ConsignListVO> consignListVOS = new ArrayList<>();
+		Map<Long, List<Consign>> collect1 = list.stream().collect(Collectors.groupingBy(Consign::getConsignConfigId));
+		for (Map.Entry<Long, List<Consign>> entry : collect1.entrySet()) {
+			consignListVO = new ConsignListVO();
+			Integer num = entry.getValue().size();
+			if(num > 0){
+				consignListVO.setConsignConfigId(entry.getKey());
+				consignListVO.setOrderNum(num);
+				consignListVO.setOrderPrice(new BigDecimal(entry.getValue().get(0).getConsignPrice()).setScale(2, BigDecimal.ROUND_DOWN));
+				consignListVOS.add(consignListVO);
+			}
+		}
+		return R.data(consignListVOS);
+	}
+
+
 	/**
 	 *
 	 * @return

src/main/java/org/springblade/modules/api/request/ConsignPayRequest.java

@@ -0,0 +1,29 @@
+package org.springblade.modules.api.request;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 地址请求实体
+ *
+ * @author xuwei
+ */
+@Data
+@ApiModel(value = "确认打款清单", description = "请求实体类")
+public class ConsignPayRequest implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty("批次id")
+	private Long consignConfigId;
+
+	@ApiModelProperty("寄售单id列表")
+	private List<Long> consignId;
+
+	@ApiModelProperty("付款方式")
+	private Integer payType;
+}