|
|
@@ -624,6 +624,10 @@ public class FsStorePaymentServiceImpl implements IFsStorePaymentService {
|
|
|
break;
|
|
|
case 2:
|
|
|
json = companyConfigService.selectRedPacketConfigByKey(param.getCompanyId());
|
|
|
+ //如果分公司配置为空就走总后台的配置
|
|
|
+ if (StringUtils.isEmpty(json)){
|
|
|
+ json = configService.selectConfigByKey("redPacket.config");
|
|
|
+ }
|
|
|
config = JSONUtil.toBean(json, RedPacketConfig.class);
|
|
|
break;
|
|
|
default:
|
|
|
@@ -749,6 +753,10 @@ public class FsStorePaymentServiceImpl implements IFsStorePaymentService {
|
|
|
break;
|
|
|
case 2:
|
|
|
json = companyConfigService.selectRedPacketConfigByKey(param.getCompanyId());
|
|
|
+ //如果分公司配置为空就走总后台的配置
|
|
|
+ if (StringUtils.isEmpty(json)){
|
|
|
+ json = configService.selectConfigByKey("redPacket.config");
|
|
|
+ }
|
|
|
config = JSONUtil.toBean(json, RedPacketConfig.class);
|
|
|
break;
|
|
|
default:
|