update

src/main/java/com/gogirl/application/market/coupon/impl/CouponCustomerRelevanceServiceImpl.java

@@ -110,7 +110,8 @@ public class CouponCustomerRelevanceServiceImpl extends ServiceImpl<CouponCustom
         IPage<CouponCustomerRelevance> page = new Page<>(pageNum, pageSize);
         page = couponCustomerRelevanceMapper.selectPage(page, new LambdaQueryWrapper<CouponCustomerRelevance>()
                 .eq(CouponCustomerRelevance::getCustomerId, customerId)
-                .eq(CouponCustomerRelevance::getState, state));
+                .eq(CouponCustomerRelevance::getState, state)
+                .eq(CouponCustomerRelevance::getSourceType, CouponCustomerRelevance.SOURCE_TYPE_INNER));
         this.joinCouponCustomerRelevanceMapper(page.getRecords());
 
         /*校验是否可用*/

src/main/java/com/gogirl/shared/order/TreeProgram.java

@@ -131,5 +131,27 @@ public class TreeProgram implements Serializable {
         /**/
         return sameServe && sameTech;
     }
+
+
+    public SimpleTreeProgram getSimpleNode() {
+        SimpleTreeProgram simpleTreeProgram = new SimpleTreeProgram();
+        simpleTreeProgram.setEndTime(this.getScheduleServeQuery().getPeriod().getEndTime());
+        simpleTreeProgram.setStartTime(this.getScheduleServeQuery().getPeriod().getStartTime());
+
+        simpleTreeProgram.setProduceId(this.getScheduleServeQuery().getProduceId());
+        simpleTreeProgram.setServeId(this.getScheduleServeQuery().getServeId());
+        simpleTreeProgram.setTechnicianId(this.getStoreTechnicianDTO().getTechnicianId());
+
+        return simpleTreeProgram;
+    }
+
+    @Data
+    static final class SimpleTreeProgram {
+        private Integer technicianId;
+        private Integer serveId;
+        private Integer produceId;
+        private Long startTime;
+        private Long endTime;
+    }
 }