developrelease_toaliyun_real
| @@ -46,7 +46,7 @@ public class BillNotificationSchedule { | |||||
| /** | /** | ||||
| * 每天9点执行 | * 每天9点执行 | ||||
| */ | */ | ||||
| @Scheduled(cron = "0 0 9 * * ?") | |||||
| @Scheduled(cron = "0 0 14 * * ?") | |||||
| public void sendMsgFromBill() { | public void sendMsgFromBill() { | ||||
| logger.info("账单通知任务启动"); | logger.info("账单通知任务启动"); | ||||
| sendWaitPayBill(); | sendWaitPayBill(); | ||||
| @@ -357,13 +357,15 @@ public class WxOrderServiceImpl implements WxOrderService { | |||||
| logger.error("商户不存在, couponId: " + couponIdStr); | logger.error("商户不存在, couponId: " + couponIdStr); | ||||
| throw new MallinkException(ErrorCode.MERCHANT_INFO_NOT_FOUND); | throw new MallinkException(ErrorCode.MERCHANT_INFO_NOT_FOUND); | ||||
| } | } | ||||
| if (!orderGroupId.equals(0L)) { | |||||
| // 拼团 | |||||
| /* | |||||
| if (orderGroupId != null && !orderGroupId.equals(0L)) { | |||||
| WxOrderGroup group = wxOrderGroupMapper.selectByPrimaryKey(orderGroupId); | WxOrderGroup group = wxOrderGroupMapper.selectByPrimaryKey(orderGroupId); | ||||
| if (group.getStatus().equals(EnumOrderStatus.ORDER_STATUS_COOPERATING_COMPLETE.getCode())) { | if (group.getStatus().equals(EnumOrderStatus.ORDER_STATUS_COOPERATING_COMPLETE.getCode())) { | ||||
| logger.error("下订单拼团人数已满>>>" + orderGroupId); | logger.error("下订单拼团人数已满>>>" + orderGroupId); | ||||
| throw new MallinkException(ErrorCode.ORDER_GROUP_COOPERATING_FINISHED); | throw new MallinkException(ErrorCode.ORDER_GROUP_COOPERATING_FINISHED); | ||||
| } | } | ||||
| } | |||||
| }*/ | |||||
| // 减库存操作 | // 减库存操作 | ||||
| stockReduce(user, coupon, couponIdStr); | stockReduce(user, coupon, couponIdStr); | ||||
| @@ -270,7 +270,7 @@ select bill.tenant_id,bill.merchant_id,bill.receive_date,ifnull(sum(need_pay),0) | |||||
| group by bill.tenant_id,bill.merchant_id,bill.receive_date) bill | group by bill.tenant_id,bill.merchant_id,bill.receive_date) bill | ||||
| left join wx_merchant m on bill.merchant_id=m.id | left join wx_merchant m on bill.merchant_id=m.id | ||||
| left join (select tenant_id,`name` appname from wx_appinfo app where type=1) app on bill.tenant_id=app.tenant_id | left join (select tenant_id,`name` appname from wx_appinfo app where type=1) app on bill.tenant_id=app.tenant_id | ||||
| where m.status=1 | |||||
| </select> | </select> | ||||
| @@ -313,7 +313,7 @@ select bill.tenant_id,bill.merchant_id,bill.receive_date,ifnull(sum(need_pay),0) | |||||
| group by bill.tenant_id,bill.merchant_id) bill | group by bill.tenant_id,bill.merchant_id) bill | ||||
| left join wx_merchant m on bill.merchant_id=m.id | left join wx_merchant m on bill.merchant_id=m.id | ||||
| left join (select tenant_id,`name` appname from wx_appinfo app where type=1) app on bill.tenant_id=app.tenant_id | left join (select tenant_id,`name` appname from wx_appinfo app where type=1) app on bill.tenant_id=app.tenant_id | ||||
| where m.status=1 | |||||
| </select> | </select> | ||||
| </mapper> | </mapper> | ||||