|
|
@@ -15,6 +15,7 @@ import cn.hutool.json.JSONUtil;
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
import com.alibaba.fastjson.TypeReference;
|
|
|
import com.baomidou.mybatisplus.core.conditions.Wrapper;
|
|
|
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
|
|
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
|
|
import com.fs.common.annotation.DataScope;
|
|
|
@@ -40,7 +41,9 @@ import com.fs.core.config.WxMaConfiguration;
|
|
|
import com.fs.core.config.WxPayProperties;
|
|
|
import com.fs.core.utils.OrderCodeUtils;
|
|
|
import com.fs.course.config.RedPacketConfig;
|
|
|
+import com.fs.course.domain.FsCoursePlaySourceConfig;
|
|
|
import com.fs.course.domain.FsCourseRedPacketLog;
|
|
|
+import com.fs.course.mapper.FsCoursePlaySourceConfigMapper;
|
|
|
import com.fs.course.service.IFsCourseRedPacketLogService;
|
|
|
import com.fs.course.service.IFsUserCourseOrderService;
|
|
|
import com.fs.course.service.IFsUserVipOrderService;
|
|
|
@@ -142,6 +145,8 @@ public class FsStorePaymentServiceImpl implements IFsStorePaymentService {
|
|
|
@Autowired
|
|
|
private FsStorePaymentScrmMapper fsStorePaymentScrmMapper;
|
|
|
@Autowired
|
|
|
+ private FsCoursePlaySourceConfigMapper fsCoursePlaySourceConfigMapper;
|
|
|
+ @Autowired
|
|
|
private TzBankService tzBankService;
|
|
|
@Autowired
|
|
|
private IFsInquiryOrderService inquiryOrderService;
|
|
|
@@ -636,6 +641,11 @@ public class FsStorePaymentServiceImpl implements IFsStorePaymentService {
|
|
|
String appId = StringUtils.isBlank(param.getAppId()) ? config.getMiniappId() : param.getAppId();
|
|
|
config.setAppId(appId);
|
|
|
}
|
|
|
+ if("wx503cf8ab31f83dd4".equals(config.getAppId())){
|
|
|
+ config.setIsNew(0);
|
|
|
+ }else{
|
|
|
+ config.setIsNew(1);
|
|
|
+ }
|
|
|
logger.info("最终传参 {}",config);
|
|
|
//组合返回参数
|
|
|
R result = new R();
|
|
|
@@ -754,6 +764,11 @@ public class FsStorePaymentServiceImpl implements IFsStorePaymentService {
|
|
|
String appId = StringUtils.isBlank(param.getAppId()) ? config.getMiniappId() : param.getAppId();
|
|
|
config.setAppId(appId);
|
|
|
}
|
|
|
+ if("wx503cf8ab31f83dd4".equals(config.getAppId())){
|
|
|
+ config.setIsNew(0);
|
|
|
+ }else{
|
|
|
+ config.setIsNew(1);
|
|
|
+ }
|
|
|
logger.info("最终传参 {}",config);
|
|
|
//组合返回参数
|
|
|
R result = new R();
|