|
@@ -23,6 +23,7 @@ import com.fs.common.utils.poi.ExcelUtil;
|
|
|
import com.fs.company.mapper.CompanyConfigMapper;
|
|
|
import com.fs.company.param.FsStoreStatisticsParam;
|
|
|
import com.fs.company.vo.FsStorePaymentStatisticsVO;
|
|
|
+import com.fs.config.cloud.CloudHostProper;
|
|
|
import com.fs.core.config.WxPayProperties;
|
|
|
import com.fs.core.utils.OrderCodeUtils;
|
|
|
import com.fs.course.config.CourseConfig;
|
|
@@ -153,6 +154,9 @@ public class FsStorePaymentServiceImpl implements IFsStorePaymentService {
|
|
|
@Autowired
|
|
|
private FsUserWxMapper userWxMapper;
|
|
|
|
|
|
+ @Autowired
|
|
|
+ private CloudHostProper cloudHostProper;
|
|
|
+
|
|
|
/**
|
|
|
* 查询支付明细
|
|
|
*
|
|
@@ -571,7 +575,7 @@ public class FsStorePaymentServiceImpl implements IFsStorePaymentService {
|
|
|
if(StringUtils.isEmpty(code)){
|
|
|
return R.error("红包单号生成失败,请重试");
|
|
|
}
|
|
|
- request.setOutBatchNo("fsCourse" + code);
|
|
|
+ request.setOutBatchNo("fsCourse"+cloudHostProper.getProjectCode() + code);
|
|
|
request.setBatchRemark("课堂答题奖励");
|
|
|
request.setBatchName("课堂答题奖励");
|
|
|
Integer amount = WxPayUnifiedOrderRequest.yuanToFen(param.getAmount().toString());
|
|
@@ -583,7 +587,7 @@ public class FsStorePaymentServiceImpl implements IFsStorePaymentService {
|
|
|
TransferBatchesRequest.TransferDetail transferDetail = new TransferBatchesRequest.TransferDetail();
|
|
|
transferDetail.setOpenid(param.getOpenId());
|
|
|
String code1 = IdUtil.getSnowflake(0, 0).nextIdStr();
|
|
|
- transferDetail.setOutDetailNo("fsCourse" + code1);
|
|
|
+ transferDetail.setOutDetailNo("fsCourse"+cloudHostProper.getProjectCode() + code1);
|
|
|
transferDetail.setTransferAmount(amount);
|
|
|
transferDetail.setTransferRemark("恭喜同学,认真听课,奖励你一朵小红花!");
|
|
|
transferDetailList.add(transferDetail);
|