修改定时参数配置、添加获取扣税比率

src/main/java/org/springblade/common/constant/CommonConstant.java

@@ -200,4 +200,10 @@ public interface CommonConstant {
 	 */
 	String GAIN_CONSIGN_TIME = "gain:consign:time";
 
+
+	/**
+	 * 扣除收益比率
+	 */
+	String PLATFORM_TAX_RATIO = "platform:tax:ratio";
+
 }

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

@@ -702,8 +702,10 @@ public class AliPay01Controller extends BladeController {
 				if(consign.getObtainPrice() < consign.getConsignPrice()){
 					//收益金额 收益金额等于抢购价减去取得价
 					BigDecimal bigDecimal = new BigDecimal(price).subtract(new BigDecimal(consign.getObtainPrice())).setScale(2, BigDecimal.ROUND_HALF_UP);
-					//税费金额 todo 0.03修改为配置
-					BigDecimal bigDecimal1 = bigDecimal.multiply(new BigDecimal(0.03)).setScale(2, BigDecimal.ROUND_HALF_UP);
+					//获取配置参数
+					BigDecimal taxRatio = new BigDecimal(ParamCache.getValue(CommonConstant.PLATFORM_TAX_RATIO));
+					//税费金额
+					BigDecimal bigDecimal1 = bigDecimal.multiply(taxRatio).setScale(2, BigDecimal.ROUND_HALF_UP);
 					//收款金额需扣除税费
 					price = new BigDecimal(consign.getConsignPrice()).subtract(bigDecimal1).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
 				}

src/main/java/org/springblade/modules/api/service/impl/TradeServiceImpl.java

@@ -150,6 +150,8 @@ public class TradeServiceImpl implements ITradeService {
 							orderConsign.setIsConfirm(2);//确认
 						}
 						orderConsignService.save(orderConsign);
+						consign.setConsignState(3);
+						consignService.updateById(consign);
 					} catch (AlipayApiException e) {
 						e.printStackTrace();
 						logger.info("打款失败", ",打款人：" + name + "支付宝账号：" + identity);
@@ -166,6 +168,7 @@ public class TradeServiceImpl implements ITradeService {
 		}else{
 			logger.info("系统打款失败", DateUtil.today());
 		}
+
 	}
 
 	@Override

src/main/java/org/springblade/modules/api/task/ConsignSchedulingTask.java

@@ -73,16 +73,15 @@ public class ConsignSchedulingTask implements SchedulingConfigurer {
 				//0/5 * * * * ?
 				//0 0 1 * * ?
 				//定时时间间隔 分钟
-				int taskTime = Integer.parseInt(ParamCache.getValue(CommonConstant.TASK_SCHEDULING_TIME));//分钟
-				if(StringUtil.isEmpty(taskTime)){
-					taskTime = 10;
+				String cron = ParamCache.getValue(CommonConstant.TASK_SCHEDULING_TIME);
+				if(StringUtil.isEmpty(cron)){
+					cron = "0 10 00 * * ?";
 				}
-				log.info(TASK_NAME + "定时时间间隔: " + taskTime);
-				String cron = "0 0/" + taskTime + " * * * ?";
+				log.info(TASK_NAME + "定时时间间隔: " + cron);
+				//String cron = "0 0/" + taskTime + " * * * ?";
 				//23:20:00执行
 				//String cron = "0 20 23 * * ?";
 				//00:10:00执行
-				//String cron = "0 10 00 * * ?";
 				CronTrigger trigger = new CronTrigger(cron);
 				return trigger.nextExecutionTime(triggerContext);
 			}