Commit 78fb53bc by huluobin

update

parent 6f7b3e66
...@@ -211,4 +211,5 @@ public class CareerCmdServiceImpl implements CareerCmdService { ...@@ -211,4 +211,5 @@ public class CareerCmdServiceImpl implements CareerCmdService {
return baseProducePage; return baseProducePage;
} }
} }
...@@ -111,6 +111,7 @@ public class StoreTechnicianServiceImpl extends ServiceImpl<StoreTechnicianMappe ...@@ -111,6 +111,7 @@ public class StoreTechnicianServiceImpl extends ServiceImpl<StoreTechnicianMappe
if (storeTechnician.getDepartmentId() != null) { if (storeTechnician.getDepartmentId() != null) {
wrapper.eq(StoreTechnician::getDepartmentId, storeTechnician.getDepartmentId()); wrapper.eq(StoreTechnician::getDepartmentId, storeTechnician.getDepartmentId());
} }
wrapper.eq(StoreTechnician::getIsAdmin, false)
return this.list(wrapper); return this.list(wrapper);
} }
} }
...@@ -121,5 +121,6 @@ public class StoreTechnician implements Serializable { ...@@ -121,5 +121,6 @@ public class StoreTechnician implements Serializable {
@TableField(exist = false) @TableField(exist = false)
private StoreTechnicianDTO applyStoreTechnicianDTO; private StoreTechnicianDTO applyStoreTechnicianDTO;
@ApiModelProperty("是否管理员")
private Boolean isAdmin; private Boolean isAdmin;
} }
...@@ -29,6 +29,7 @@ import com.gogirl.infrastructure.common.util.JsonUtilByJackson; ...@@ -29,6 +29,7 @@ import com.gogirl.infrastructure.common.util.JsonUtilByJackson;
import com.gogirl.infrastructure.common.util.ListUtil; import com.gogirl.infrastructure.common.util.ListUtil;
import com.gogirl.infrastructure.config.property.GogirlProperties; import com.gogirl.infrastructure.config.property.GogirlProperties;
import com.gogirl.infrastructure.mapper.market.coupon.CouponCustomerRelevanceMapper; import com.gogirl.infrastructure.mapper.market.coupon.CouponCustomerRelevanceMapper;
import com.gogirl.infrastructure.mapper.market.discount.LeisureDiscountConfigLimitMapper;
import com.gogirl.infrastructure.mapper.market.timescard.TimesCardCustomerRelevanceMapper; import com.gogirl.infrastructure.mapper.market.timescard.TimesCardCustomerRelevanceMapper;
import com.gogirl.infrastructure.mapper.order.mall.MallOrderMapper; import com.gogirl.infrastructure.mapper.order.mall.MallOrderMapper;
import com.gogirl.infrastructure.mapper.order.serve.OrderManageMapper; import com.gogirl.infrastructure.mapper.order.serve.OrderManageMapper;
...@@ -121,6 +122,7 @@ public class Schedule { ...@@ -121,6 +122,7 @@ public class Schedule {
private final GogirlProperties gogirlProperties; private final GogirlProperties gogirlProperties;
private final TechnicianPushService technicianPushService; private final TechnicianPushService technicianPushService;
private final LeisureDiscountConfigLimitMapper leisureDiscountConfigLimitMapper;
private final TimesCardCustomerRelevanceMapper timesCardCustomerRelevanceMapper; private final TimesCardCustomerRelevanceMapper timesCardCustomerRelevanceMapper;
private final RestTemplate restTemplate; private final RestTemplate restTemplate;
...@@ -382,6 +384,18 @@ public class Schedule { ...@@ -382,6 +384,18 @@ public class Schedule {
localDate = localDate.plusDays(1); localDate = localDate.plusDays(1);
} }
log.debug("同步闲时折扣周 结束"); log.debug("同步闲时折扣周 结束");
log.debug("同步最新闲时间折扣限制开始");
try {
leisureDiscountConfigLimitMapper.syncWeekConfigLimit();
} catch (Exception e) {
log.error("同步最新闲时间折扣限制失败");
}
log.debug("同步最新闲时间折扣限制结束");
leisureDiscountConfigLimitMapper
} }
/** /**
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment