update

src/main/java/com/gogirl/application/order/serve/PayService.java

 package com.gogirl.application.order.serve;
 
-import com.github.binarywang.wxpay.bean.notify.WxPayOrderNotifyResult;
 import com.github.binarywang.wxpay.bean.order.WxPayMpOrderResult;
 import com.github.binarywang.wxpay.exception.WxPayException;
-import com.gogirl.domain.market.discount.DiscountConfig;
-import com.gogirl.domain.order.serve.OrderManage;
-import com.gogirl.domain.user.customer.CustomerBalance;
-import com.gogirl.domain.user.customer.CustomerBalanceRecord;
 import com.gogirl.shared.member.order.command.BalanceWxPayQuery;
 import com.gogirl.shared.member.order.query.UnifiedOrderQuery;
 
@@ -24,18 +19,6 @@ public interface PayService {
      */
     void consumeBalance(Integer currentCustomerId, Integer orderId);
 
-
-    /**
-     * 预约订单支付回调
-     * 1.设置订单折扣详情，包括次卡抵扣状态、内部券抵扣详情、外部券抵扣详情
-     * 2.更新预约订单状态
-     *
-     * @param scheduleOrderNo 预约订单编号
-     * @param paymentType     支付类型
-     */
-    void notifyOrder(String scheduleOrderNo, Integer paymentType);
-
-
     /**
      * 微信支付预约订单
      *

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

@@ -801,6 +801,8 @@ public class OrderManageServiceImpl extends ServiceImpl<OrderManageMapper, Order
         }
 
         orderManage.setPayTime(new Date());
+        //支付用户等于下单用户
+        orderManage.setPayUser(orderManage.getOrderUser());
         //发送订阅消息
         subscribeService.sendPaySuccessMsg(orderId, customer.getOpenid1(), payTypeStr, new Date(), orderManage.getTotalPaymentAmount(), new BigDecimal(customerBalance.getBalance() / 100));
         this.updateById(orderManage);
@@ -832,6 +834,8 @@ public class OrderManageServiceImpl extends ServiceImpl<OrderManageMapper, Order
         orderManage.setPayTime(new Date());
         orderManage.setUpdateTime(new Date());
 
+        Customer payCustomer = customerService.getByOpenid1(result.getOpenid());
+        orderManage.setPayUser(payCustomer.getId());
         this.updateById((orderManage));
 
 
@@ -884,6 +888,11 @@ public class OrderManageServiceImpl extends ServiceImpl<OrderManageMapper, Order
         orderManage.setPaymentType(OrderManage.PAYMENT_WX);
         orderManage.setPayTime(new Date());
         orderManage.setUpdateTime(new Date());
+
+        //支付用户
+        Customer customer = customerService.getByOpenid1(result.getOpenid());
+        orderManage.setPayUser(customer.getId());
+
         this.updateById(orderManage);
 
         /*2.更新卡券状态*/
@@ -1007,7 +1016,7 @@ public class OrderManageServiceImpl extends ServiceImpl<OrderManageMapper, Order
             }
 
         });
-        ScheduleManage scheduleManage= scheduleManageMapper.selectById(orderManage.getScheduledId());
+        ScheduleManage scheduleManage = scheduleManageMapper.selectById(orderManage.getScheduledId());
         orderManage.setScheduleManage(scheduleManage);
         return orderManage;
     }

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

@@ -81,6 +81,10 @@ public class PayServiceImpl implements PayService {
         orderManage.setPayTime(new Date());
         orderManage.setPaymentType(OrderManage.PAYMENT_BALANCE);
         orderManage.setStatus(OrderManage.STATUS_UN_COMMENT);
+
+        //支付用户
+        orderManage.setPayUser(currentCustomerId);
+
         orderManageService.updateById(orderManage);
 
 
@@ -89,29 +93,6 @@ public class PayServiceImpl implements PayService {
         marketService.setterOrderMarket(orderManage.getId());
     }
 
-    @Override
-    public void notifyOrder(String wxScheduleOrderNo, Integer paymentType) {
-
-        String orderNo = wxScheduleOrderNo.substring(6);
-        OrderManage orderManage = orderManageService.queryOrderByOrderNo(orderNo);
-
-        /*1.更新订单状态*/
-        log.info("设置订单折扣详情 orderManageDTO {}", orderManage);
-
-        log.info("更新订单状态");
-        //订单状态 待评价
-        orderManage.setStatus(OrderManage.STATUS_UN_COMMENT);
-
-        //支付方式
-        orderManage.setPaymentType(paymentType);
-        orderManage.setPayTime(new Date());
-        orderManage.setUpdateTime(new Date());
-        orderManageService.updateById(orderManage);
-
-        /*2.更新卡券状态*/
-        marketService.setterOrderMarket(orderManage.getId());
-
-    }
 
 
     @Override

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

@@ -244,9 +244,16 @@ public class ScheduleManageServiceImpl extends ServiceImpl<ScheduleManageMapper,
         long end3Time = simpleDateFormat.parse(qry.getScheduleDate() + " 22:00:00").getTime();
 
         List<Long> dateTimeList = new ArrayList<>();
-        while (start3Time < end3Time) {
-            dateTimeList.add(start3Time);
-            start3Time = start3Time + 15 * 60000;
+        //是否只查询指定时间段
+        if (ListUtil.isNotEmpty(qry.getDateTimeList())) {
+            dateTimeList = qry.getDateTimeList();
+        }
+        //返回全部时间段
+        else {
+            while (start3Time < end3Time) {
+                dateTimeList.add(start3Time);
+                start3Time = start3Time + 15 * 60000;
+            }
         }
 
         idleTimeQuery.setDateTimeList(dateTimeList);
@@ -346,7 +353,10 @@ public class ScheduleManageServiceImpl extends ServiceImpl<ScheduleManageMapper,
             TreeProgram defaultNode = parent.getChildList()
                     .stream()
                     .filter(treeProgram1 ->
-                            !treeProgram1.getStoreTechnicianDTO().equals(parent.getStoreTechnicianDTO())
+                            !list.stream().map(TreeProgram::getStoreTechnicianDTO)
+                                    .map(StoreTechnicianPeriod::getTechnicianId)
+                                    .collect(Collectors.toList())
+                                    .contains(treeProgram1.getStoreTechnicianDTO().getTechnicianId())
                     )
                     .findAny()
                     .orElse(parent.getChildList().get(0));

src/main/java/com/gogirl/application/user/customer/impl/CustomerServiceImpl.java

@@ -429,6 +429,12 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerMapper, Customer> i
         return token;
     }
 
+    @Override
+    public Customer getByOpenid1(String openid) {
+        return customerMapper.selectOne(new LambdaQueryWrapper<Customer>()
+                .eq(Customer::getOpenid1, openid));
+    }
+
 
     /**
      * 将emoji表情替换成空串

src/main/java/com/gogirl/domain/order/serve/OrderManage.java

@@ -263,6 +263,8 @@ public class OrderManage implements Serializable {
     @ApiModelProperty("支付时间")
     private Date payTime;
 
+    private Integer payUser;
+
     public void addDiscountPrice(BigDecimal discountPrice) {
         this.discountPrice = this.discountPrice.add(discountPrice);
         this.totalPaymentAmount = this.totalPaymentAmount.subtract(discountPrice);

src/main/java/com/gogirl/dto/IdleTimeProgramQuery.java

@@ -121,4 +121,5 @@ public class IdleTimeProgramQuery {
     private Customer customer;
 
 
+    private List<Long> dateTimeList;
 }