Merge branch '3.7' of /Users/huluobin/IdeaProjects/gogirl-miniapp-backend with conflicts.

log/gogirl-member-info.2020-04-13.log

+2020-04-13 11:35:52.311  INFO 2960 --- [           main] com.gogirl.GogirlMiniappApplication      : Starting GogirlMiniappApplication on huluobindeMacBook-Pro.local with PID 2960 (/Users/huluobin/IdeaProjects/gogirl-miniapp-backend/target/classes started by huluobin in /Users/huluobin/IdeaProjects/gogirl-miniapp-backend)
+2020-04-13 11:35:52.314  INFO 2960 --- [           main] com.gogirl.GogirlMiniappApplication      : The following profiles are active: pre
+2020-04-13 11:36:03.044  INFO 2960 --- [           main] com.gogirl.GogirlMiniappApplication      : Started GogirlMiniappApplication in 11.313 seconds (JVM running for 12.053)
+2020-04-13 12:00:00.099  INFO 2960 --- [pool-2-thread-1] c.g.infrastructure.schedule.Schedule     : 评价提醒推送定时任务开始
+2020-04-13 12:00:00.127  INFO 2960 --- [pool-2-thread-1] c.g.infrastructure.schedule.Schedule     : 评价提醒推送定时任务结束
+2020-04-13 13:02:36.377  INFO 2960 --- [pool-2-thread-1] c.g.infrastructure.schedule.Schedule     : 评价提醒推送定时任务开始
+2020-04-13 13:02:36.407  INFO 2960 --- [pool-2-thread-1] c.g.infrastructure.schedule.Schedule     : 评价提醒推送定时任务结束
+2020-04-13 13:30:00.101  INFO 2960 --- [pool-2-thread-1] c.g.infrastructure.schedule.Schedule     : 评价提醒推送定时任务开始
+2020-04-13 13:30:00.137  INFO 2960 --- [pool-2-thread-1] c.g.infrastructure.schedule.Schedule     : 评价提醒推送定时任务结束
+2020-04-13 14:00:00.000  INFO 2960 --- [pool-2-thread-1] c.g.infrastructure.schedule.Schedule     : 评价提醒推送定时任务开始
+2020-04-13 14:00:00.030  INFO 2960 --- [pool-2-thread-1] c.g.infrastructure.schedule.Schedule     : 评价提醒推送定时任务结束
+2020-04-13 14:30:00.138  INFO 2960 --- [pool-2-thread-1] c.g.infrastructure.schedule.Schedule     : 评价提醒推送定时任务开始
+2020-04-13 14:30:00.164  INFO 2960 --- [pool-2-thread-1] c.g.infrastructure.schedule.Schedule     : 评价提醒推送定时任务结束
+2020-04-13 15:00:00.095  INFO 2960 --- [pool-2-thread-1] c.g.infrastructure.schedule.Schedule     : 评价提醒推送定时任务开始
+2020-04-13 15:00:00.119  INFO 2960 --- [pool-2-thread-1] c.g.infrastructure.schedule.Schedule     : 评价提醒推送定时任务结束
+2020-04-13 15:30:00.110  INFO 2960 --- [pool-2-thread-1] c.g.infrastructure.schedule.Schedule     : 评价提醒推送定时任务开始
+2020-04-13 15:30:00.133  INFO 2960 --- [pool-2-thread-1] c.g.infrastructure.schedule.Schedule     : 评价提醒推送定时任务结束
+2020-04-13 16:08:59.048  INFO 2960 --- [pool-2-thread-1] c.g.infrastructure.schedule.Schedule     : 评价提醒推送定时任务开始
+2020-04-13 16:08:59.083  INFO 2960 --- [pool-2-thread-1] c.g.infrastructure.schedule.Schedule     : 评价提醒推送定时任务结束
+2020-04-13 16:30:00.121  INFO 2960 --- [pool-2-thread-1] c.g.infrastructure.schedule.Schedule     : 评价提醒推送定时任务开始
+2020-04-13 16:30:00.150  INFO 2960 --- [pool-2-thread-1] c.g.infrastructure.schedule.Schedule     : 评价提醒推送定时任务结束
+2020-04-13 17:00:00.130  INFO 2960 --- [pool-2-thread-1] c.g.infrastructure.schedule.Schedule     : 评价提醒推送定时任务开始
+2020-04-13 17:00:00.153  INFO 2960 --- [pool-2-thread-1] c.g.infrastructure.schedule.Schedule     : 评价提醒推送定时任务结束
+2020-04-13 17:30:00.549  INFO 2960 --- [pool-2-thread-1] c.g.infrastructure.schedule.Schedule     : 评价提醒推送定时任务开始
+2020-04-13 17:30:00.574  INFO 2960 --- [pool-2-thread-1] c.g.infrastructure.schedule.Schedule     : 评价提醒推送定时任务结束
+2020-04-13 18:00:00.192  INFO 2960 --- [pool-2-thread-1] c.g.infrastructure.schedule.Schedule     : 评价提醒推送定时任务开始
+2020-04-13 18:00:00.215  INFO 2960 --- [pool-2-thread-1] c.g.infrastructure.schedule.Schedule     : 评价提醒推送定时任务结束

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

 package com.gogirl;
 
-import com.alibaba.excel.EasyExcel;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.gogirl.application.market.coupon.CouponCustomerRelevanceService;
@@ -32,7 +31,6 @@ import com.gogirl.domain.xcx.GogirlToken;
 import com.gogirl.domain.xcx.TimeNode;
 import com.gogirl.domain.xcx.WeekConfig;
 import com.gogirl.infrastructure.common.util.JsonUtilByFsJson;
-import com.gogirl.infrastructure.common.util.StringUtils;
 import com.gogirl.infrastructure.mapper.market.coupon.CouponCustomerRelevanceMapper;
 import com.gogirl.infrastructure.mapper.market.discount.DiscountConfigMapper;
 import com.gogirl.infrastructure.mapper.market.discount.LeisureDiscountConfigWeekMapper;
@@ -40,10 +38,8 @@ import com.gogirl.infrastructure.mapper.market.timescard.TimesCardCustomerReleva
 import com.gogirl.infrastructure.mapper.order.pay.OrderPayMapper;
 import com.gogirl.infrastructure.mapper.order.serve.OrderManageMapper;
 import com.gogirl.infrastructure.mapper.order.serve.OrderServeMapper;
-import com.gogirl.infrastructure.mapper.product.purchase.PurchaseSkuMapper;
 import com.gogirl.infrastructure.mapper.product.purchase.PurchaseStockMapper;
 import com.gogirl.infrastructure.mapper.product.purchase.PurchaseStockRecordMapper;
-import com.gogirl.infrastructure.mapper.product.serve.BaseProduceMapper;
 import com.gogirl.infrastructure.mapper.store.complaint.ComplaintDetailedMapper;
 import com.gogirl.infrastructure.mapper.store.complaint.ComplaintDetailedTechnicianMapper;
 import com.gogirl.infrastructure.mapper.store.complaint.ComplaintMainMapper;
@@ -56,7 +52,6 @@ import com.gogirl.infrastructure.mapper.xcx.TimeNodeMapper;
 import com.gogirl.infrastructure.mapper.xcx.WeekConfigMapper;
 import com.gogirl.infrastructure.schedule.Schedule;
 import com.gogirl.infrastructure.service.mail.MailService;
-import com.gogirl.shared.product.PurchaseSkuPOI;
 import lombok.extern.slf4j.Slf4j;
 import org.assertj.core.util.Lists;
 import org.junit.runner.RunWith;
@@ -66,8 +61,6 @@ import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.test.context.junit4.SpringRunner;
 
 import javax.annotation.Resource;
-import java.net.MalformedURLException;
-import java.net.URL;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.time.LocalDate;
@@ -653,6 +646,7 @@ public class Test {
     @org.junit.Test
     public void reCalcOrderDataIntegrity() {
 
+
         List<OrderManage> orderManageList = orderManageMapper.selectList(new LambdaQueryWrapper<OrderManage>()
                 .gt(OrderManage::getCreateTime, "2020-01-01"));
 
@@ -667,41 +661,13 @@ public class Test {
         });
     }
 
-    @Resource
-    PurchaseSkuMapper purchaseSkuMapper;
-
-    @org.junit.Test
-    public void purchaseSkuExcel() {
-
-        List<PurchaseSkuPOI> purchaseSkuPOIList = purchaseSkuMapper.purchaseSkuExcel();
-//        List<PurchaseSkuPOI>
-
-        String fileName = "/Users/huluobin/purchaseSku6.xlsx";
-
-        purchaseSkuPOIList.forEach(purchaseSkuPOI -> {
-            try {
-                if (StringUtils.isNotEmpty(purchaseSkuPOI.getPicturePath())
-                        && !purchaseSkuPOI.getPicturePath().contains(",")) {
-                    purchaseSkuPOI.setImagesUrl(
-                            new URL("http://qn.begogirls.com/" + purchaseSkuPOI.getPicturePath())
-                    );
-                    purchaseSkuPOI.setPicturePath("http://qn.begogirls.com/" + purchaseSkuPOI.getPicturePath());
-                }
-            } catch (MalformedURLException e) {
-                e.printStackTrace();
-            }
-        });
-
-        EasyExcel.write(fileName, PurchaseSkuPOI.class).sheet("purchaseSku").doWrite(purchaseSkuPOIList);
-    }
-
-    @Resource
-    BaseProduceMapper baseProduceMapper;
 
+    /**
+     * 重算订单金额
+     */
     @org.junit.Test
     public void calcOrderAmount() {
-        marketService.orderAmountReCalc(13659);
+        marketService.calcOrderAmount(13431);
     }
 
-
 }