Browse Source

fix(app):修复教练信息查询空指针异常

- 使用 CollUtil 判断集合非空避免空指针- 增加对 appCategory 查询结果的空值判断
- 调整微信支付回调地址为新的测试域名
- 更新微信退款通知地址至新内网穿透链接
wzq 1 month ago
parent
commit
163dfa4ba8

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

@@ -123,14 +123,16 @@ public class DetailServiceImpl implements IDetailService {
         List<PlaceInfoVO.InstructorVO> instructorVOList = new ArrayList<>();
         List<AppInstructor> appInstructors = appInstructorMapper.selectList(Wrappers.<AppInstructor>lambdaQuery()
                 .eq(AppInstructor::getOrgCode, appSite.getOrgCode()));
-        if (appInstructors != null) {
+        if (CollUtil.isNotEmpty(appInstructors)) {
             for (AppInstructor instructor : appInstructors) {
                 PlaceInfoVO.InstructorVO vo = new PlaceInfoVO.InstructorVO();
                 BeanUtils.copyProperties(instructor,vo); // 注意参数顺序
                 List<String> category = new ArrayList<>();
                 Arrays.stream(instructor.getTrainingPrograms().split(",")).forEach(categoryId -> {
                     AppCategory appCategory = appCategoryMapper.selectById(categoryId);
-                    category.add(appCategory.getName());
+                    if (appCategory != null) {
+                        category.add(appCategory.getName());
+                    }
                 });
                 vo.setCategory(category);
                 SysUser sysUser = sysUserMapper.selectById(instructor.getUserId());

+ 4 - 4
national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/pay/config/WechatUrlConstants.java

@@ -17,12 +17,12 @@ public class WechatUrlConstants {
     public final static String PAY_V3_QUERY_OUT = "https://api.mch.weixin.qq.com/v3/pay/partner/transactions/out-trade-no/{out_trade_no}";
 
     //微信支付v3 支付通知接口地址
-    public final static String PAY_V3_NOTIFY = "https://admin.qlapp.cn/jeecgboot/app/order/wechatPayNotify";
-//    public final static String PAY_V3_NOTIFY = "https://60deed35.r28.cpolar.top/jeecg-boot/app/order/wechatPayNotify";
+//    public final static String PAY_V3_NOTIFY = "https://admin.qlapp.cn/jeecgboot/app/order/wechatPayNotify";
+    public final static String PAY_V3_NOTIFY = "https://1c10f6fa.r28.cpolar.top/jeecg-boot/app/order/wechatPayNotify";
 
     //微信支付v3 退款通知接口地址
-    public final static String PAY_V3_REFUND_NOTIFY = "https://admin.qlapp.cn/jeecgboot/app/order/callback/refundOrderNotify";
-//    public final static String PAY_V3_REFUND_NOTIFY = "https://60deed35.r28.cpolar.top/jeecg-boot/app/order/callback/refundOrderNotify";
+//    public final static String PAY_V3_REFUND_NOTIFY = "https://admin.qlapp.cn/jeecgboot/app/order/callback/refundOrderNotify";
+    public final static String PAY_V3_REFUND_NOTIFY = "https://1c10f6fa.r28.cpolar.top/jeecg-boot/app/order/callback/refundOrderNotify";
 
     //服务商 添加分账接收方
     public final static String PAY_V3_RECEIVERS_ADD = "https://api.mch.weixin.qq.com/v3/profitsharing/receivers/add";