update

src/main/java/com/gogirl/application/order/pay/IOrderPayService.java

+package com.gogirl.application.order.pay;
+
+import com.gogirl.domain.order.pay.OrderPay;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 订单支付明细 服务类
+ * </p>
+ *
+ * @author robbendev
+ * @since 2020-03-12
+ */
+public interface IOrderPayService extends IService<OrderPay> {
+
+}

src/main/java/com/gogirl/application/order/pay/impl/OrderPayServiceImpl.java

+package com.gogirl.application.order.pay.impl;
+
+import com.gogirl.domain.order.pay.OrderPay;
+import com.gogirl.infrastructure.mapper.order.pay.OrderPayMapper;
+import com.gogirl.application.order.pay.IOrderPayService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 订单支付明细 服务实现类
+ * </p>
+ *
+ * @author robbendev
+ * @since 2020-03-12
+ */
+@Service
+public class OrderPayServiceImpl extends ServiceImpl<OrderPayMapper, OrderPay> implements IOrderPayService {
+
+}

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

@@ -616,7 +616,7 @@ public class ScheduleManageServiceImpl extends ServiceImpl<ScheduleManageMapper,
 
             if (!scheduleServeSet.stream().map(ScheduleServe::getStatus).map(stats -> stats == 3).collect(Collectors.toList()).contains(false)) {
 
-                if (!scheduleManage.getStatus().equals(8)) {
+                if (!scheduleManage.getStatus().equals(8) || scheduleManage.getStatus() != 3) {
                     throw new RRException("重复请求");
                 }
 
@@ -1072,14 +1072,14 @@ public class ScheduleManageServiceImpl extends ServiceImpl<ScheduleManageMapper,
 
         List<ScheduleServe> scheduleServeList = scheduleManageCommand.getScheduleServeDTOList()
                 .stream()
+                //参数补全
                 .peek(scheduleServeCmd -> {
-                    //调用产品服务根据id查询 预约服务
+
                     BaseServe baseServe = baseServeMapper.selectById(scheduleServeCmd.getServeId());
                     BaseType baseType = baseTypeService.getById(baseServe.getTypeId());
                     //调用用户服务 根据id查询美甲师
                     StoreTechnician storeTechnician = storeTechnicianMapper.selectById(scheduleServeCmd.getTechnicianId());
 
-
                     //服务详情设置
                     scheduleServeCmd.setServeName(baseServe.getName());
                     scheduleServeCmd.setServePicturePath(baseServe.getPicturePath());
@@ -1087,7 +1087,6 @@ public class ScheduleManageServiceImpl extends ServiceImpl<ScheduleManageMapper,
                     scheduleServeCmd.setTechnicianName(storeTechnician.getName());
                     scheduleServeCmd.setServeType(baseType.getName());
 
-
                     String technicianNames = storeTechnicianMapper.selectBatchIds(Lists.newArrayList(scheduleServeCmd.getTechnicianIds().split(","))).stream().map(StoreTechnician::getName).collect(Collectors.joining(","));
                     scheduleServeCmd.setTechnicianNames(technicianNames);
 
@@ -1110,14 +1109,15 @@ public class ScheduleManageServiceImpl extends ServiceImpl<ScheduleManageMapper,
                     scheduleServeCmd.setLengthTime(baseServe.getServiceDuration());
 
                 })
+                //更新预约价格
                 .peek(scheduleServeCmd -> {
                     scheduleManage.setTotalPrice(scheduleManage.getTotalPrice().add(scheduleServeCmd.getPrice()));
                 })
                 .map(scheduleServeCommand -> {
                     List<ScheduleServe> list = new ArrayList<>();
+                    //如果是多个美甲师要写多条记录
                     if (StringUtils.isNotEmpty(scheduleServeCommand.getTechnicianIds())) {
                         ScheduleServe scheduleServe = scheduleServeMapper.selectById(scheduleServeCommand.getId());
-
                         Lists.newArrayList(scheduleServeCommand.getTechnicianIds().split(","))
                                 .forEach(id -> {
                                     ScheduleServe item;
@@ -1130,7 +1130,6 @@ public class ScheduleManageServiceImpl extends ServiceImpl<ScheduleManageMapper,
                                     item.setTechnicianId(Integer.valueOf(id));
                                     StoreTechnician storeTechnician = storeTechnicianMapper.selectById(item.getTechnicianId());
                                     item.setTechnicianName(storeTechnician.getName());
-
                                     SpringBeanUtils.copyPropertiesIgnoreNull(scheduleServeCommand, item);
                                     list.add(item);
                                 });

src/main/java/com/gogirl/domain/order/pay/OrderPay.java

+package com.gogirl.domain.order.pay;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * <p>
+ * 订单支付明细
+ * </p>
+ *
+ * @author robbendev
+ * @since 2020-03-12
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "OrderPay对象", description = "订单支付明细")
+public class OrderPay implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "订单id")
+    private Integer orderId;
+
+    @ApiModelProperty(value = "微信 = 1, 会员 = 2, 充值 = 4, pos机 = 5, 大众点评 = 7, 会员帮付 = 11, 次卡 =12")
+    private Integer type;
+
+    @ApiModelProperty(value = "金额")
+    private BigDecimal amount;
+
+
+}

src/main/java/com/gogirl/infrastructure/mapper/market/coupon/CouponCustomerRelevanceMapper.java

@@ -37,4 +37,5 @@ public interface CouponCustomerRelevanceMapper extends BaseMapper<CouponCustomer
      */
     List<Integer> queryCouponCustomerServeRelevance(Integer couponId);
 
+    List<CouponCustomerRelevance> selectByOrderTimes();
 }

src/main/java/com/gogirl/infrastructure/mapper/order/pay/OrderPayMapper.java

+package com.gogirl.infrastructure.mapper.order.pay;
+
+import com.gogirl.domain.order.pay.OrderPay;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 订单支付明细 Mapper 接口
+ * </p>
+ *
+ * @author robbendev
+ * @since 2020-03-12
+ */
+public interface OrderPayMapper extends BaseMapper<OrderPay> {
+
+}

src/main/java/com/gogirl/interfaces/order/pay/OrderPayController.java

+package com.gogirl.interfaces.order.pay;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 订单支付明细 前端控制器
+ * </p>
+ *
+ * @author robbendev
+ * @since 2020-03-12
+ */
+@RestController
+@RequestMapping("/order-pay")
+public class OrderPayController {
+
+}

src/main/resources/application-dev.yml

@@ -62,6 +62,9 @@ gogirl:
   #服务器图片临时地址
   picture-path: /upload/grouppic/
 
+  end-time: "22:00:00"
+  start-time: "10:00:00"
+
 
 server:
   port: 5444

src/main/resources/application-pre.yml

@@ -62,6 +62,10 @@ gogirl:
   #服务器图片临时地址
   picture-path: /upload/grouppic/
 
+  end-time: 22:00
+  start-time: 10:00
+
+
 wx:
   pay:
     appId: wxd5e3224465422206

src/main/resources/application-prod.yml

@@ -25,7 +25,7 @@ spring:
     name: gogirl-wxapp-member-backend
   # 数据配置
   datasource:
-    url: jdbc:mysql://10.0.0.9:3306/bailun_gogirl?useUnicode=true&characterEncoding=utf-8&useSSL=false&&zeroDateTimeBehavior=convertToNull
+    url: jdbc:mysql://gz-cdb-c0sq6eax.sql.tencentcdb.com:60779/bailun_gogirl?useUnicode=true&characterEncoding=utf-8&useSSL=false&zeroDateTimeBehavior=convertToNull
     username: root
     password: "#7kfnymAM$Y9-Ntf"
     driver-class-name: com.mysql.jdbc.Driver
@@ -55,6 +55,8 @@ gogirl:
 
   #服务器图片临时地址
   picture-path: /upload/grouppic/
+  end-time: 22:00
+  start-time: 10:00
 
 # 注册中心配置
 eureka:

src/main/resources/application.yml

 spring:
   profiles:
-    active: dev
+    active: prod
   servlet:
     #文件上传最大容量
     multipart:

src/main/resources/mapper/OrderPayMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.gogirl.infrastructure.mapper.order.pay.OrderPayMapper">
+
+</mapper>

src/main/resources/mapper/market/CouponCustomerRelevanceMapper.xml

@@ -24,6 +24,13 @@
         GROUP BY id
         ORDER BY id asc
     </select>
+    <select id="selectByOrderTimes" resultType="com.gogirl.domain.market.coupon.CouponCustomerRelevance">
+        SELECT t1.*
+        from coupon_customer_relevance t1
+                 LEFT JOIN order_manage t2 on t1.order_id = t2.id
+        where t2.finish_time > '2020-01-01'
+          and t1.state = 2
+    </select>
 
     <update id="setCouponExpire" parameterType="java.util.Date">
         update coupon_customer_relevance

src/test/java/com/gogirl/Test.java

 package com.gogirl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.gogirl.domain.market.coupon.CouponCustomerRelevance;
+import com.gogirl.domain.order.pay.OrderPay;
+import com.gogirl.domain.order.serve.MultiPaymentType;
+import com.gogirl.domain.order.serve.OrderManage;
 import com.gogirl.domain.xcx.TimeNode;
 import com.gogirl.domain.xcx.WeekConfig;
+import com.gogirl.infrastructure.common.util.JsonUtilByFsJson;
+import com.gogirl.infrastructure.mapper.market.coupon.CouponCustomerRelevanceMapper;
 import com.gogirl.infrastructure.mapper.market.discount.LeisureDiscountConfigWeekMapper;
+import com.gogirl.infrastructure.mapper.order.pay.OrderPayMapper;
+import com.gogirl.infrastructure.mapper.order.serve.OrderManageMapper;
 import com.gogirl.infrastructure.mapper.xcx.TimeNodeMapper;
 import com.gogirl.infrastructure.mapper.xcx.WeekConfigMapper;
+import lombok.extern.slf4j.Slf4j;
 import org.junit.runner.RunWith;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
@@ -14,11 +23,12 @@ import javax.annotation.Resource;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.time.LocalDate;
-import java.time.LocalDateTime;
 import java.time.LocalTime;
+import java.util.List;
 
 @RunWith(SpringRunner.class)
 @SpringBootTest
+@Slf4j
 public class Test {
 
     @Resource
@@ -60,5 +70,98 @@ public class Test {
         }
     }
 
+    @Resource
+    OrderPayMapper orderPayMapper;
+    @Resource
+    OrderManageMapper orderManageMapper;
+    @Resource
+    CouponCustomerRelevanceMapper couponCustomerRelevanceMapper;
+
+    @org.junit.Test
+    public void orderPay() {
+
+        orderPayMapper.delete(new LambdaQueryWrapper<>());
+
+        List<OrderManage> orderManageList = orderManageMapper.selectList(new LambdaQueryWrapper<OrderManage>()
+                .gt(OrderManage::getFinishTime, "2020-01-01"));
+
+
+        // order_pay 微信 = 1, 会员 = 2, 充值 = 4, pos机 = 5, 大众点评 = 7, 会员帮付 = 11, 次卡 =12
+        //1#微信 2#会员 3#其他4#充值5#pos机6#现金7#大众点评8#微信扫码支付9#团购10#免单11#会员帮付12#余额抵扣微信支付13余额pos支付
+        orderManageList.forEach(orderManage -> {
+            if (orderManage.getPaymentType().equals(1)) {
+                OrderPay orderPay = new OrderPay();
+                orderPay.setAmount(orderManage.getTotalPaymentAmount());
+                orderPay.setOrderId(orderManage.getId());
+                orderPay.setType(1);
+                orderPayMapper.insert(orderPay);
+            }
+            if (orderManage.getPaymentType().equals(2)) {
+                OrderPay orderPay = new OrderPay();
+                orderPay.setAmount(orderManage.getTotalPaymentAmount());
+                orderPay.setOrderId(orderManage.getId());
+                orderPay.setType(2);
+                orderPayMapper.insert(orderPay);
+            }
+            if (orderManage.getPaymentType().equals(5)) {
+                OrderPay orderPay = new OrderPay();
+                orderPay.setAmount(orderManage.getTotalPaymentAmount());
+                orderPay.setOrderId(orderManage.getId());
+                orderPay.setType(5);
+                orderPayMapper.insert(orderPay);
+            }
+
+            if (orderManage.getPaymentType().equals(12) || orderManage.getPaymentType().equals(13)) {
 
+                try {
+                    List<MultiPaymentType> multiPaymentTypeList = JsonUtilByFsJson.jsonToList(orderManage.getMultiplePaymentType(), MultiPaymentType.class);
+                    multiPaymentTypeList.forEach(multiPaymentType -> {
+                        if (multiPaymentType.getType().equals(1)) {
+                            OrderPay orderPay = new OrderPay();
+                            orderPay.setAmount(multiPaymentType.getPrice());
+                            orderPay.setOrderId(orderManage.getId());
+                            orderPay.setType(1);
+                            orderPayMapper.insert(orderPay);
+                        }
+                        if (multiPaymentType.getType().equals(2)) {
+                            OrderPay orderPay = new OrderPay();
+                            orderPay.setAmount(multiPaymentType.getPrice());
+                            orderPay.setOrderId(orderManage.getId());
+                            orderPay.setType(2);
+                            orderPayMapper.insert(orderPay);
+                        }
+
+                        if (multiPaymentType.getType().equals(5)) {
+                            OrderPay orderPay = new OrderPay();
+                            orderPay.setAmount(multiPaymentType.getPrice());
+                            orderPay.setOrderId(orderManage.getId());
+                            orderPay.setType(5);
+                            orderPayMapper.insert(orderPay);
+                        }
+                    });
+                } catch (Exception e) {
+                    log.error("orderId:no multi :{}", orderManage.getId());
+                }
+            }
+        });
+
+        orderPayMapper.delete(new LambdaQueryWrapper<OrderPay>().eq(OrderPay::getAmount, 0));
+    }
+
+
+    @org.junit.Test
+    public void customerPay() {
+
+        List<CouponCustomerRelevance> couponCustomerRelevanceList = couponCustomerRelevanceMapper.selectByOrderTimes();
+
+        couponCustomerRelevanceList.forEach(couponCustomerRelevance -> {
+            if (couponCustomerRelevance.getSourceType().equals(1)) {
+                OrderPay orderPay = new OrderPay();
+                orderPay.setAmount(couponCustomerRelevance.getPayAmount());
+                orderPay.setOrderId(couponCustomerRelevance.getOrderId());
+                orderPay.setType(7);
+                orderPayMapper.insert(orderPay);
+            }
+        });
+    }
 }