Преглед изворни кода

fix(order):修复订单使用地址获取逻辑- 在AppOrderServiceImpl中补充设置订单ID字段
-修正订单类型为1时使用地址的获取方式,通过机构编码查询部门名称作为使用地址
- 保持订单类型为2时原有地址获取逻辑不变

SheepHy пре 4 недеља
родитељ
комит
74fbc81dba

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

@@ -1154,7 +1154,7 @@ public class OrderServiceImpl implements IOrderService {
                 }if (appOrder.getType() == 1){
                     AppGamePriceRules appGamePriceRules = appGamePriceRulesMapper.selectById(createOrderForm.getProductIds());
                     AppGame appGame = appGameMapper.findByPriceRules(appGamePriceRules.getId());
-                    appIsin.setUseAddress(appGame.getSiteAddress());
+                    appIsin.setUseAddress(sysDepartMapper.selectOne(Wrappers.<SysDepart>lambdaQuery().eq(SysDepart::getOrgCode, appGame.getOrgCode())).getDepartName());
                 }if (appOrder.getType() == 2){
                     AppSite appSite = appSiteMapper.selectById(appCoursesMapper.selectById(appOrderProInfo.getProductId()).getAddressSiteId());
                     appIsin.setUseAddress(appSite.getName());

+ 1 - 0
national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/service/impl/AppOrderServiceImpl.java

@@ -150,6 +150,7 @@ public class AppOrderServiceImpl extends ServiceImpl<AppOrderMapper, AppOrder> i
         AppSite site = appSiteMapper.selectOne(Wrappers.lambdaQuery(AppSite.class).eq(AppSite::getOrgCode, appOrder.getOrgCode()));
         //构建返回对象
         AppOrderInfoVO appOrderInfoVO = new AppOrderInfoVO();
+        appOrderInfoVO.setId(appOrder.getId());
         //订单编号
         appOrderInfoVO.setOrderCode(appOrder.getOrderCode());
         //订单类型