|
@@ -49,8 +49,10 @@ public class PayMerchantServiceImpl extends ServiceImpl<PayMerchantMapper, PayMe
|
|
public boolean addOrUpdate(PayMerchantAddUpdateParam param) {
|
|
public boolean addOrUpdate(PayMerchantAddUpdateParam param) {
|
|
Map<Long, PayWayDTO> payWayMap = payWayService.payWayMap();
|
|
Map<Long, PayWayDTO> payWayMap = payWayService.payWayMap();
|
|
String payDeviceIds = null;
|
|
String payDeviceIds = null;
|
|
- if (CollectionUtils.isNotEmpty(param.getPayDeviceIdList())) {
|
|
|
|
- payDeviceIds = param.getPayDeviceIdList().stream().map(String::valueOf).collect(Collectors.joining(","));
|
|
|
|
|
|
+ if (CollectionUtils.isNotEmpty(param.getPayDeviceChoiceVOList())) {
|
|
|
|
+ payDeviceIds = param.getPayDeviceChoiceVOList().stream()
|
|
|
|
+ .map(PayDeviceChoiceVO::getId)
|
|
|
|
+ .map(String::valueOf).collect(Collectors.joining(","));
|
|
}
|
|
}
|
|
Long payWayId = param.getPayWayId();
|
|
Long payWayId = param.getPayWayId();
|
|
String payConfig = null;
|
|
String payConfig = null;
|