Pārlūkot izejas kodu

refactor(app): 优化订单创建逻辑

- 修改了 AppGame 的查询方法,使用 findByPriceRules替代 selectById
- 更新了 AppOrderProInfo 中地址字段的赋值,使用 siteAddress 替代 address
- 优化了时间格式化的处理方式
wzq 2 nedēļas atpakaļ
vecāks
revīzija
82138b2e62

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

@@ -741,7 +741,7 @@ public class OrderServiceImpl implements IOrderService {
                 //个人赛
                 if (Objects.equals(createOrderForm.getOrderType(), CommonConstant.ORDER_PRO_INFO_TYPE_3)) {
                     AppGamePriceRules appGamePriceRules = appGamePriceRulesMapper.selectById(createOrderForm.getProductIds());
-                    AppGame appGame = appGameMapper.selectById(appGamePriceRules.getGameId());
+                    AppGame appGame = appGameMapper.findByPriceRules(appGamePriceRules.getGameId());
                     AppGameSchedule appGameSchedule = appGameScheduleMapper.selectOne(Wrappers.<AppGameSchedule>lambdaQuery().eq(AppGameSchedule::getGameId, appGame.getId()).last("limit 1"));
 
                     appOrder.setOrgCode(appGamePriceRules.getOrgCode());
@@ -760,7 +760,7 @@ public class OrderServiceImpl implements IOrderService {
                         AppOrderProInfo appOrderProInfo = new AppOrderProInfo();
                         appOrderProInfo.setProductId(createOrderForm.getProductIds());
                         appOrderProInfo.setProductName(appGame.getName());
-                        appOrderProInfo.setAddress(appGame.getAddress());
+                        appOrderProInfo.setAddress(appGame.getSiteAddress());
                         appOrderProInfo.setType(CommonConstant.ORDER_PRO_INFO_TYPE_3);
                         appOrderProInfo.setFrameTimeStr(startTime + "-" + endTime);
                         appOrderProInfo.setExpireTime(DateUtil.format(appGameSchedule.getEndTime(), "yyyy-MM-dd HH:mm:ss"));
@@ -798,9 +798,10 @@ public class OrderServiceImpl implements IOrderService {
                 }
                 if (Objects.equals(createOrderForm.getOrderType(), CommonConstant.ORDER_PRO_INFO_TYPE_4)){
                     AppGamePriceRules appGamePriceRules = appGamePriceRulesMapper.selectById(createOrderForm.getProductIds());
-                    AppGame appGame = appGameMapper.selectById(appGamePriceRules.getGameId());
+                    AppGame appGame = appGameMapper.findByPriceRules(appGamePriceRules.getGameId());
                     AppGameSchedule appGameSchedule = appGameScheduleMapper.selectOne(Wrappers.<AppGameSchedule>lambdaQuery().eq(AppGameSchedule::getGameId, appGame.getId()).last("limit 1"));
 
+
                     String startTime = DateUtil.format(appGame.getStartTime(), "HH:mm:ss");
                     String endTime = DateUtil.format(appGame.getEndTime(), "HH:mm:ss");
 
@@ -817,7 +818,7 @@ public class OrderServiceImpl implements IOrderService {
                         AppOrderProInfo appOrderProInfo = new AppOrderProInfo();
                         appOrderProInfo.setProductId(createOrderForm.getProductIds());
                         appOrderProInfo.setProductName(appGame.getName());
-                        appOrderProInfo.setAddress(appGame.getAddress());
+                        appOrderProInfo.setAddress(appGame.getSiteAddress());
                         appOrderProInfo.setType(CommonConstant.ORDER_PRO_INFO_TYPE_4);
                         appOrderProInfo.setFrameTimeStr(startTime + "-" + endTime);
                         appOrderProInfo.setExpireTime(DateUtil.format(appGameSchedule.getEndTime(), "yyyy-MM-dd HH:mm:ss"));