update

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

@@ -1274,6 +1274,8 @@ public class ScheduleManageServiceImpl extends ServiceImpl<ScheduleManageMapper,
             if (!scheduleManage.getStatus().equals(8) && scheduleManage.getStatus() != 3) {
                 throw new RRException("重复请求");
             }
+            scheduleManage.setStatus(ScheduleManage.STATUS_KEEP_SCHEDULED);
+            scheduleManageMapper.updateById(scheduleManage);
 
             OrderManage orderManage = OrderManage.builder()
                     //订单类型
@@ -1315,15 +1317,7 @@ public class ScheduleManageServiceImpl extends ServiceImpl<ScheduleManageMapper,
             for (ScheduleServe scheduleServeVar : scheduleServeSet) {
 
                 BigDecimal orderServePrice = scheduleServeVar.getPrice();
-//                //如果是预约服务使用服务特价
-//                if (scheduleServeVar.getProduceId() != null && scheduleServeVar.getProduceBargainPrice() != null) {
-//                    orderServePrice = scheduleServeVar.getProduceCurrentPrice();
-//                }
-//                //预约款式使用款式价格
-//                else {
-//                    orderServePrice = scheduleServeVar.getServePrice();
-//                }
-//
+
                 BaseServe baseServe = baseServeMapper.selectById(scheduleServeVar.getServeId());
                 OrderServe orderServe = OrderServe.builder()
                         //服务参数

src/main/java/com/gogirl/application/product/serve/impl/BaseProduceServiceImpl.java

@@ -57,10 +57,14 @@ public class BaseProduceServiceImpl extends ServiceImpl<BaseProduceMapper, BaseP
         page = baseProduceMapper.queryProducePage(page, featuresId, serveTypeId, sort);
 
         List<Integer> produceIds = page.getRecords().stream().map(BaseProduce::getId).collect(Collectors.toList());
-        List<PraiseRecord> praiseRecordList = praiseRecordMapper.selectList(new LambdaQueryWrapper<PraiseRecord>()
-                .in(PraiseRecord::getServeId, produceIds)
-                .eq(PraiseRecord::getCustomerId, SessionUtils.getCustomerId())
-                .eq(PraiseRecord::getType, 2));
+
+        LambdaQueryWrapper<PraiseRecord> wrapper = new LambdaQueryWrapper<>();
+        wrapper.in(PraiseRecord::getServeId, produceIds)
+                .eq(PraiseRecord::getType, 2);
+        if (SessionUtils.getCustomerToken() != null) {
+            wrapper.eq(PraiseRecord::getCustomerId, SessionUtils.getCustomerId());
+        }
+        List<PraiseRecord> praiseRecordList = praiseRecordMapper.selectList(wrapper);
         Map<Integer, List<PraiseRecord>> map = praiseRecordList.stream().collect(Collectors.groupingBy(PraiseRecord::getServeId));
         page.getRecords().forEach(baseProduce -> {
             List<PraiseRecord> mapPraiseRecordList = map.get(baseProduce.getId());

src/main/resources/application-pre.yml

@@ -24,7 +24,8 @@ spring:
     name: gogirl-wxapp-member-backend
   #数据配置
   datasource:
-    url: jdbc:mysql://gz-cdb-c0sq6eax.sql.tencentcdb.com:60779/gogirl_pre?useUnicode=true&characterEncoding=utf-8&useSSL=false&&zeroDateTimeBehavior=convertToNull
+    url: jdbc:mysql://10.0.0.9:3306/gogirl_pre?useUnicode=true&characterEncoding=utf-8&useSSL=false&&zeroDateTimeBehavior=convertToNull
+    #    url: jdbc:mysql://gz-cdb-c0sq6eax.sql.tencentcdb.com:60779/gogirl_pre?useUnicode=true&characterEncoding=utf-8&useSSL=false&&zeroDateTimeBehavior=convertToNull
     username: root
     password: "#7kfnymAM$Y9-Ntf"
     driver-class-name: com.mysql.jdbc.Driver

src/main/resources/application-prod.yml

@@ -25,7 +25,8 @@ spring:
     name: gogirl-wxapp-member-backend
   # 数据配置
   datasource:
-    url: jdbc:mysql://gz-cdb-c0sq6eax.sql.tencentcdb.com:60779/bailun_gogirl?useUnicode=true&characterEncoding=utf-8&useSSL=false&zeroDateTimeBehavior=convertToNull
+    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