fix

src/main/java/com/gogirl/application/market/impl/CouponServiceImpl.java

@@ -175,8 +175,12 @@ public class CouponServiceImpl extends ServiceImpl<CouponMapper, Coupon> impleme
             throw new RRException("请联系管理员配置发放哪张新人优惠券");
         }
 
+
         //判断是否有领过相关的优惠券
-        List<CouponCustomerRelevance> list = this.selectMyNewCustomerCoupon(customerId, couponIdList);
+        List<CouponCustomerRelevance> list = couponCustomerRelevanceMapper.selectList(new LambdaQueryWrapper<CouponCustomerRelevance>()
+                .eq(CouponCustomerRelevance::getCustomerId, customerId)
+                .in(CouponCustomerRelevance::getCouponId, couponIdList));
+
         if (list.size() > 0) {
             return null;
         }

src/main/java/com/gogirl/application/order/serve/impl/OrderManageServiceImpl.java

@@ -286,6 +286,9 @@ public class OrderManageServiceImpl extends ServiceImpl<OrderManageMapper, Order
 
         IPage<OrderManage> orderManagePage = this.page(pageParam, wrapper);
 
+        if (ListUtil.isEmpty(orderManagePage.getRecords())) {
+            return orderManagePage;
+        }
         //通过id子查询
         List<Integer> orderIdList = orderManagePage.getRecords().stream().map(OrderManage::getId).collect(Collectors.toList());
 

src/main/java/com/gogirl/application/order/serve/impl/ScheduleManageServiceImpl.java

@@ -1467,6 +1467,10 @@ public class ScheduleManageServiceImpl extends ServiceImpl<ScheduleManageMapper,
         IPage<ScheduleManage> page = new Page<>();
         page = scheduleManageMapper.selectPage(page, wrapper);
 
+        if (ListUtil.isEmpty(page.getRecords())) {
+            return page;
+        }
+        
         List<ScheduleServe> scheduleServeList = scheduleServeMapper.selectList(new LambdaQueryWrapper<ScheduleServe>().in(ScheduleServe::getSchId, page.getRecords().stream().map(ScheduleManage::getId).collect(Collectors.toList())));
         Map<Integer, List<ScheduleServe>> scheduleServeMap = scheduleServeList.stream().collect(Collectors.groupingBy(ScheduleServe::getSchId));
 

src/main/java/com/gogirl/application/product/mall/MallProductService.java

+package com.gogirl.application.product.mall;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.gogirl.domain.product.mall.MallProduct;
+
+public interface MallProductService extends IService<MallProduct> {
+}

src/main/java/com/gogirl/application/store/store/impl/TakeLeaveEventCmdServiceImpl.java

@@ -151,7 +151,10 @@ public class TakeLeaveEventCmdServiceImpl implements TakeLeaveEventCmdService {
 
     @Override
     public TakeLeaveEvent queryTakeLeave(Long id) {
-        return takeLeaveEventRepository.selectById(id);
+        TakeLeaveEvent takeLeaveEvent = takeLeaveEventRepository.selectById(id);
+        StoreTechnician storeTechnician = storeTechnicianRepository.selectById(takeLeaveEvent.getApplyTechnicianId());
+        takeLeaveEvent.setApplyStoreTechnician(storeTechnician);
+        return takeLeaveEvent;
     }
 
     @Override

src/main/java/com/gogirl/domain/store/oa/TakeLeaveEvent.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.gogirl.domain.store.store.StoreTechnician;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -73,5 +74,6 @@ public class TakeLeaveEvent {
 
     private Long createTime;
 
+    private StoreTechnician applyStoreTechnician;
 
 }

src/main/java/com/gogirl/domain/store/store/StoreData.java

@@ -95,4 +95,7 @@ public class StoreData {
     @ApiModelProperty("总开卡业绩排行")
     @TableField(exist = false)
     private List<StoreTechnicianTotalAchieve> storeTechnicianTotalChargeAchieveList;
+
+
+
 }

src/main/java/com/gogirl/infrastructure/schedule/Schedule.java

@@ -30,6 +30,7 @@ import com.gogirl.infrastructure.mapper.user.CustomerBalanceRecordMapper;
 import com.gogirl.infrastructure.subscribe.SubscribeService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
@@ -40,7 +41,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
-//@EnableScheduling
+@EnableScheduling
 @AllArgsConstructor
 @Slf4j
 @Component

src/main/java/com/gogirl/interfaces/product/mall/MallProductController.java

 package com.gogirl.interfaces.product.mall;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.gogirl.domain.product.mall.MallProduct;
 import com.gogirl.infrastructure.common.base.JsonResult;
 import com.gogirl.shared.product.query.dto.MallProductDTO;
 import com.gogirl.shared.product.query.qry.ProductQuery;
@@ -13,20 +14,39 @@ import org.springframework.web.bind.annotation.*;
 @AllArgsConstructor
 @Api(tags = "version3.0:商城产品接口", value = "version3.0:商城产品接口")
 public class MallProductController {
-
     @ApiOperation("分页查询商城产品列表")
     @PostMapping("/customer/mallProduct/queryPageProduct")
-    public JsonResult<Page<MallProductDTO>> queryPageProduct(@RequestBody ProductQuery qry) {
-
-//        return mallProductControllerFeign.queryPageProduct(qry);
-
+    public JsonResult<Page<MallProduct>> queryPageProduct(@RequestBody ProductQuery qry) {
+//
+////        return mallProductControllerFeign.queryPageProduct(qry);
+//
+//        Specification<MallProduct> specification = (Specification<MallProduct>) (root, criteriaQuery, cb) -> {
+//            Predicate predicate = cb.conjunction();
+//            //分类
+//            if (qry.getMallCategoryId() != null) {
+//                Join<MallCategory, MallProduct> join = root.join("mallCategoryList", JoinType.LEFT);
+//                predicate.getExpressions().add(cb.equal(join.get("id"), qry.getMallCategoryId()));
+//            }
+//            //搜索
+//            if (qry.getSearchWord() != null) {
+//                predicate.getExpressions().add(cb.like(root.get("name"), "%" + qry.getSearchWord() + "%"));
+//            }
+//            //状态上架
+//            if (qry.getStatus() != null) {
+//                predicate.getExpressions().add(cb.and(root.<Integer>get("status").in(qry.getStatus())));
+//            }
+//            return predicate;
+//        };
+//
+//        Sort sort = Sort.by("createTime").descending();
+//        PageRequest pageRequest = PageRequest.of(qry.getPageNum() - 1, qry.getPageSize(), sort);
+//        Page<MallProduct> page = mallProductRepository.findAll(specification, pageRequest);
         return JsonResult.success();
     }
 
     @ApiOperation("查询商城产品详情")
     @GetMapping("/customer/mallProduct/queryProduct")
     public JsonResult<MallProductDTO> queryProduct(@RequestParam Long mallProductId) {
-//        return mallProductControllerFeign.queryProduct(mallProductId);
 
         return JsonResult.success();
     }

src/main/java/com/gogirl/interfaces/store/OverTimeRecordController.java

 package com.gogirl.interfaces.store;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.gogirl.application.xcx.GogirlTokenService;
+import com.gogirl.domain.store.oa.OvertimeRecord;
+import com.gogirl.domain.store.store.StoreTechnician;
+import com.gogirl.infrastructure.common.base.JsonResult;
+import com.gogirl.infrastructure.mapper.store.OvertimeRecordMapper;
+import com.gogirl.infrastructure.util.SessionUtils;
+import com.gogirl.shared.store.query.qry.OrderTimeRecordPageQuery;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
 
 @Api(tags = "version 3.0: 加班记录接口")
 @AllArgsConstructor
@@ -14,12 +27,29 @@ public class OverTimeRecordController {
 
     private final GogirlTokenService gogirlTokenService;
 
-//    @ApiOperation("加班记录")
-//    @PostMapping("/technician/overTimeRecord/queryPage")
-//    public JsonResult<Page<OvertimeRecordDTO>> queryPage(@RequestHeader String token,
-//                                                         @RequestBody OrderTimeRecordPageQuery qry) {
-//        StoreTechnician storeTechnician = gogirlTokenService.getByToken(token).getStoreTechnician();
-//        qry.setTechnicianId(storeTechnician.getTechnicianId());
-//        return overTimeRecordControllerFeign.queryPage(qry);
-//    }
+    private final OvertimeRecordMapper overtimeRecordMapper;
+
+    @ApiOperation("加班记录")
+    @PostMapping("/queryPage")
+    public JsonResult<IPage<OvertimeRecord>> queryPage(@RequestHeader String token,
+                                                       @RequestBody OrderTimeRecordPageQuery qry) {
+
+        StoreTechnician storeTechnician = SessionUtils.getStoreTechnician();
+        Calendar cale = Calendar.getInstance();
+        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+
+        // 获取前月的第一天
+        cale = Calendar.getInstance();
+        cale.add(Calendar.MONTH, 0);
+        cale.set(Calendar.DAY_OF_MONTH, 1);
+        Date firstDay = cale.getTime();
+        Date paramDate = new Date(firstDay.getTime() - 7 * 24 * 60 * 60 * 1000);
+        IPage<OvertimeRecord> page = new Page<>();
+        page = overtimeRecordMapper.selectPage(page, new LambdaQueryWrapper<OvertimeRecord>()
+                .eq(OvertimeRecord::getTechnicianId, storeTechnician.getId())
+                .gt(OvertimeRecord::getLeftTimeLength, 0)
+                .ge(OvertimeRecord::getCreateTime, paramDate));
+
+        return JsonResult.success(page);
+    }
 }