|
@@ -12,10 +12,7 @@ import com.ylx.massage.domain.TOrder;
|
|
|
import com.ylx.massage.domain.TSign;
|
|
|
import com.ylx.massage.enums.JsStatusEnum;
|
|
|
import com.ylx.massage.enums.OrderStatusEnum;
|
|
|
-import com.ylx.massage.service.TJsService;
|
|
|
-import com.ylx.massage.service.TOrderService;
|
|
|
-import com.ylx.massage.service.TRechargeService;
|
|
|
-import com.ylx.massage.service.TSignService;
|
|
|
+import com.ylx.massage.service.*;
|
|
|
import com.ylx.massage.utils.DateTimeUtils;
|
|
|
import com.ylx.system.service.ISysDeptService;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
@@ -50,6 +47,8 @@ public class massageTask {
|
|
|
|
|
|
@Autowired
|
|
|
private TRechargeService rechargeService;
|
|
|
+ @Resource
|
|
|
+ private TJsDayService jsDayService;
|
|
|
|
|
|
|
|
|
public void cancelOrder() {
|
|
@@ -195,7 +194,7 @@ public class massageTask {
|
|
|
total = page.getTotal();
|
|
|
}
|
|
|
//查询所有部门
|
|
|
- List<SysDept> sysDepts = deptService.selectDeptList(null);
|
|
|
+ List<SysDept> sysDepts = deptService.selectDeptList(new SysDept());
|
|
|
|
|
|
sysDepts.forEach(sysDept -> {
|
|
|
//查询所有技师
|
|
@@ -222,6 +221,8 @@ public class massageTask {
|
|
|
tJsDay.setTurnover(turnover);
|
|
|
BigDecimal recharge = rechargeService.getRecharge(js.getId(), startDate, endDate);
|
|
|
tJsDay.setRecharge(recharge);
|
|
|
+ tJsDay.setCountDate(DateTimeUtils.formatDate(startDate, DateTimeUtils.DATE_FORMAT));
|
|
|
+ jsDayService.save(tJsDay);
|
|
|
});
|
|
|
}
|
|
|
});
|