Merge remote-tracking branch 'origin/master'

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/app/dto/AppOrderInfoDTO.java

@@ -142,6 +142,9 @@ public class AppOrderInfoDTO implements Serializable {
     @Schema(description = "赛程数")
     private Integer gameScheduleNum;
 
+    @Schema(description = "是否评论（0-否 1-是）")
+    private Integer orEvaluate;
+
     //商品信息
     @Schema(description = "商品信息")
     private AppCourses appCourses;

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/app/service/impl/OrderServiceImpl.java

@@ -127,6 +127,8 @@ public class OrderServiceImpl implements IOrderService {
     private RedisTemplate<String, Object> redisTemplate;
     @Resource
     private WechatPayV3Utils wechatPayV3Utils;
+    @Resource
+    private EvaluateMapper evaluateMapper;
 
     @Autowired
     IReceiptPaymentDetailsInfoService iReceiptPaymentDetailsInfoService;
@@ -1146,9 +1148,9 @@ public class OrderServiceImpl implements IOrderService {
             Map<String, String> result = payment(appOrder.getId());
             payForm.setParams(result);
 
-            //发布任务到redission延迟队列
+            //发布任务到redission延迟队列(16分钟)
             String task = CommonConstant.ORDER_TIME_OUT_TASK_PREFIX + appOrder.getId();
-            redissonDelayQueue.offerTask(task, 60 * 15);
+            redissonDelayQueue.offerTask(task, 60 * 16);
         }
         return payForm;
     }
@@ -1351,6 +1353,14 @@ public class OrderServiceImpl implements IOrderService {
             appOrderInfoDTO.setSDiscounts(appOrder.getSDiscounts());
             appOrderInfoDTO.setTDiscounts(appOrder.getTDiscounts());
         }
+        //判断当前订单是否已评论
+        List<Evaluate> evaluateList =
+                evaluateMapper.selectList(Wrappers.<Evaluate>lambdaQuery().eq(Evaluate::getOrderId, appOrder.getId()));
+        if (CollUtil.isNotEmpty(evaluateList)) {
+            appOrderInfoDTO.setOrEvaluate(1);
+        } else {
+            appOrderInfoDTO.setOrEvaluate(0);
+        }
 
         //子订单
         List<AppOrderProInfo> proInfoList = appOrderProInfoMapper.selectList(Wrappers.<AppOrderProInfo>lambdaQuery().eq(AppOrderProInfo::getOrderId, orderId));
@@ -1708,6 +1718,14 @@ public class OrderServiceImpl implements IOrderService {
             //设置超时订单时间
             record.setEpxTime(newTime);
 
+            //判断当前订单是否已评论
+            List<Evaluate> evaluateList = evaluateMapper.selectList(Wrappers.<Evaluate>lambdaQuery().eq(Evaluate::getOrderId, record.getOrderId()));
+            if (CollUtil.isNotEmpty(evaluateList)) {
+                record.setOrEvaluate(1);
+            } else {
+                record.setOrEvaluate(0);
+            }
+
             if (record.getOrderType() == 1) {
                 String appSiteRulesId = record.getProductIds().split(",")[0];
                 AppSitePriceRules appSitePriceRules = appSitePriceRulesMapper.selectById(appSiteRulesId);

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/app/vo/PageOrdersVO.java

@@ -50,6 +50,9 @@ public class PageOrdersVO implements Serializable {
     @Schema(description = "分钟可退")
     private Integer earlyRefundTime;
 
+    @Schema(description = "是否评论（0-否 1-是）")
+    private Integer orEvaluate;
+
     @Schema(description = "创建时间")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/mapper/xml/AppCoursesMapper.xml

@@ -207,7 +207,7 @@
     <select id="getPageCourse" resultType="org.jeecg.modules.app.vo.AppCoursesPageVO">
         SELECT
             c.id AS appCourseId,
-            s.address AS siteAddress,
+        s.name AS siteAddress,
             c.cover,
             c.name,
             c.class_num,

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/service/impl/AppSiteServiceImpl.java

@@ -15,8 +15,9 @@ import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.modules.system.app.dto.AppSiteDTO;
 import org.jeecg.modules.system.app.dto.AppSitePageDTO;
 import org.jeecg.modules.system.app.entity.AppSite;
-import org.jeecg.modules.system.app.entity.AppSitePriceRules;
+import org.jeecg.modules.system.app.entity.AppSitePlace;
 import org.jeecg.modules.system.app.mapper.AppSiteMapper;
+import org.jeecg.modules.system.app.mapper.AppSitePlaceMapper;
 import org.jeecg.modules.system.app.mapper.AppSitePriceRulesMapper;
 import org.jeecg.modules.system.app.service.IAppSiteService;
 import org.jeecg.modules.system.entity.SysDepart;
@@ -43,6 +44,8 @@ public class AppSiteServiceImpl extends ServiceImpl<AppSiteMapper, AppSite> impl
     private AppSitePriceRulesMapper priceRulesMapper;
     @Resource
     private SysDepartMapper sysDepartMapper;
+    @Resource
+    private AppSitePlaceMapper appSitePlaceMapper;
 
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -100,7 +103,11 @@ public class AppSiteServiceImpl extends ServiceImpl<AppSiteMapper, AppSite> impl
                 List<String> newList = Arrays.stream(siteCuDTO.getCategoryId().split(",")).collect(Collectors.toList());
                 List<String> diffList = listCompare(oldList, newList);
                 if (ObjectUtils.isNotEmpty(diffList)) {
-
+                    for (String categoryId : diffList) {
+                        //删除包场已修改的类目场地信息
+                        appSitePlaceMapper.delete(Wrappers.<AppSitePlace>lambdaQuery().eq(AppSitePlace::getSiteId,
+                                id).eq(AppSitePlace::getCategoryId, categoryId));
+                    }
                 }
             }
         }

national-motion-module-system/national-motion-system-start/src/main/resources/application.yml

@@ -2,4 +2,4 @@ spring:
   application:
     name: jeecg-system
   profiles:
-    active: prod
+    active: dev