|
@@ -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);
|