项目更新20220329

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

@@ -98,6 +98,13 @@ public class AliPay01Controller {
 		if(StringUtil.isEmpty(payFor)){
 			return R.fail("请选择支付方式！");
 		}
+		if(order.getOrderType() == 3){
+			//寄售订单而且寄售方式为寄售
+			Consign consign = consignService.getOne(Wrappers.<Consign>lambdaQuery().eq(Consign::getConsignType,order.getOutTradeNo()));
+			if (consign != null && consign.getConsignFor() == 2){
+				return R.fail("该订单为寄售单，不能发起交易！");
+			}
+		}
 		if("aliPay".equals(payFor)){
 			JSONObject data = new JSONObject();
 			data.put("out_trade_no", outTradeNo); //商户订单号
@@ -188,6 +195,7 @@ public class AliPay01Controller {
 		return R.fail("发起支付失败！");
 	}
 
+	@ApiLog("线上资金授权冻结接口")
 	@PostMapping("/pay_003")
 	@ApiOperation(value = "线上资金授权冻结接口", notes = "支付请求")
 	@ApiOperationSupport(order = 3)
@@ -425,6 +433,7 @@ public class AliPay01Controller {
 			grantUpdate.setId(query.getId());
 			if (query.getNowNum() == 1){
 				grantUpdate.setStatus(2);//解冻
+				grantUpdate.setNowNum(0);
 			}else{
 				//状态不变
 				grantUpdate.setNowNum(query.getNowNum() - 1);//减少数量

src/main/java/org/springblade/modules/finance/service/impl/OrderServiceImpl.java

@@ -362,12 +362,29 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 			if (orderGrant.getStatus() == 2){
 				response.setStatus(1);//未授权
 				return response;
-			}else {
+			}
+			//注释：如果第一次授权完成，再次授权抢回变成为授权
+			/*else {
 				//授权次数小于等已抢次数 则
 				if (orderGrant.getNum() <= count){
 					response.setStatus(1);//未授权
 					return response;
 				}
+			}*/
+			//如果剩余单数为大于1
+			if(orderGrant.getNowNum() > 1){
+				//查询当前用户已授权但是的数据
+				Integer num = 0; //授权次数
+				List<OrderGrant> list = orderGrantMapper.selectList(Wrappers.<OrderGrant>lambdaQuery()
+					.eq(OrderGrant::getDataDate, DateUtil.format(DateUtil.now(),DateUtil.PATTERN_DATE))
+					.eq(OrderGrant::getUserId, request.getUserId()));
+				for (OrderGrant grant: list){
+					num = grant.getNum() + num;
+				}
+				if (num >= count){
+					throw new ServiceException("您授权的次数已用完！");
+				}
+				response.setStatus(2);//已授权
 			}
 		}
 		//是特殊账号的不判断的抢购次数
@@ -504,7 +521,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 			//更新寄售状态为已售出
 			if(queryConsign.getNowStock() == 0){
 				Consign updateConsign = new Consign();
-				updateConsign.setId(query.getId());
+				updateConsign.setId(query.getConsignId());
 				updateConsign.setConsignState(3);//已售出
 				int k =	consignMapper.updateById(updateConsign);
 				if(k != 1){

src/main/resources/application-dev.yml

@@ -13,7 +13,7 @@ spring:
     #  commandTimeout: 5000
   datasource:
     # MySql
-    url: jdbc:mysql://39.108.56.127:3306/t-test?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
+    url: jdbc:mysql://localhost:3306/t-test?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
     username: root
     password: 123456
     # PostgreSQL