소스 검색

修复 AB小程序问题

三七 1 주 전
부모
커밋
c787a81d60

+ 1 - 0
fs-admin/src/main/java/com/fs/company/controller/CompanyController.java

@@ -132,6 +132,7 @@ public class CompanyController extends BaseController
                 callerService.updateCompanyVoiceCaller(caller);
             }
         }
+        company.setUpdateMiniApp(true);
         return toAjax(companyService.updateCompany(company));
     }
 

+ 1 - 0
fs-admin/src/main/java/com/fs/his/controller/FsCompanyController.java

@@ -145,6 +145,7 @@ public class FsCompanyController extends BaseController
     public AjaxResult edit(@RequestBody Company company)
     {
         company.setMoney(null);
+        company.setUpdateMiniApp(true);
         return toAjax(companyService.updateCompany(company));
     }
 

+ 3 - 0
fs-service/src/main/java/com/fs/company/domain/Company.java

@@ -121,6 +121,9 @@ public class Company extends BaseEntity
     @TableField(exist = false)
     private List<String> miniAppServer;
 
+    @TableField(exist = false)
+    private boolean updateMiniApp;
+
     /** 后台制单是否需要付款 默认1 0-否 1-是*/
     private Integer isPay;
 

+ 3 - 1
fs-service/src/main/java/com/fs/company/service/impl/CompanyServiceImpl.java

@@ -265,7 +265,9 @@ public class CompanyServiceImpl implements ICompanyService
     public int updateCompany(Company company)
     {
         company.setUpdateTime(DateUtils.getNowDate());
-        bindMiniApp(company);
+        if(company.isUpdateMiniApp()){
+            bindMiniApp(company);
+        }
         return companyMapper.updateCompany(company);
     }
     // 绑定小程序

+ 0 - 13
fs-service/src/main/java/com/fs/his/service/impl/FsStorePaymentServiceImpl.java

@@ -491,25 +491,12 @@ public class FsStorePaymentServiceImpl implements IFsStorePaymentService {
         }
         result.put("mchId",config.getMchId()+"");
         result.put("isNew",config.getIsNew());
-
-        // 获取配置信息 (这个地方返回炮灰服务号落地url,调用地方太多,无法一级一级下传,直接再拿一次)
-        String courseJson = configService.selectConfigByKey("course.config");
-        CourseConfig courseConfig = JSONUtil.toBean(courseJson, CourseConfig.class);
-        result.put("h5RewardUrl", Optional.ofNullable(courseConfig)
-                .map(CourseConfig::getUserCourseH5Reward)
-                .orElse(null));
-
         System.out.println("红包返回:"+result);
         return result;
     }
 
     // 内部方法:处理新版本的发红包逻辑
     private R sendRedPacketV3Internal(WxSendRedPacketParam param, RedPacketConfig config) {
-        //炮灰小程序,发服务号
-        if (param.getSource()==1 && param.getUser().getMpOpenId()!=null && StringUtils.isNotEmpty(param.getMpAppId())){
-            config.setAppId(param.getMpAppId());
-            param.setOpenId(param.getUser().getMpOpenId());
-        }
 
         WxPayConfig payConfig = new WxPayConfig();
         BeanUtils.copyProperties(config, payConfig);