Merge branch 'feature/mall_product' into test
commit
c5c73744f0
|
@ -45,7 +45,7 @@ public class ReplenishmentTask {
|
||||||
/**
|
/**
|
||||||
* 每天上午8点和下午3点执行补单计划
|
* 每天上午8点和下午3点执行补单计划
|
||||||
*/
|
*/
|
||||||
// @Scheduled(cron = "0 0 8,15 * * ?")
|
@Scheduled(cron = "0 0 9,15 * * ?")
|
||||||
@TenantIgnore
|
@TenantIgnore
|
||||||
public void replenishmentTask() {
|
public void replenishmentTask() {
|
||||||
/**
|
/**
|
||||||
|
@ -74,7 +74,7 @@ public class ReplenishmentTask {
|
||||||
// 生成随机字符串
|
// 生成随机字符串
|
||||||
String nonceStr = generateNonceStr();
|
String nonceStr = generateNonceStr();
|
||||||
// 商户密钥
|
// 商户密钥
|
||||||
String key = properties.getMchKey();
|
String key = properties.getApiv3Key();
|
||||||
|
|
||||||
// 构建请求参数
|
// 构建请求参数
|
||||||
Map<String, String> params = new HashMap<>();
|
Map<String, String> params = new HashMap<>();
|
||||||
|
@ -93,12 +93,12 @@ public class ReplenishmentTask {
|
||||||
Map<String, String> map = parseResponse(response);
|
Map<String, String> map = parseResponse(response);
|
||||||
if ("SUCCESS".equals(map.get("trade_state")) && "SUCCESS".equals(map.get("result_code"))) {
|
if ("SUCCESS".equals(map.get("trade_state")) && "SUCCESS".equals(map.get("result_code"))) {
|
||||||
// 修改订单状态
|
// 修改订单状态
|
||||||
// orderDO.setPaid(1);
|
orderDO.setPaid(1);
|
||||||
// orderDO.setIsReplenishment(1);
|
orderDO.setIsReplenishment(1);
|
||||||
// orderDO.setReplenishmentName(map.toString());
|
orderDO.setReplenishmentName(map.toString());
|
||||||
// rechargeOrderMapper.updateById(orderDO);
|
rechargeOrderMapper.updateById(orderDO);
|
||||||
// // 写入 充值档位记录表
|
// 写入 充值档位记录表
|
||||||
// storeOrderService.addPhone(orderDO, outTradeNo);
|
storeOrderService.addPhone(orderDO, outTradeNo);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue