autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-04-21 19:45:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev-g' into dev

Browse Source
This commit is contained in:
Guoqs
2025-03-12 17:00:40 +08:00
parent 39e66377e9 f471d35362
commit 2a5f29dc16
5 changed files with 42 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileMerchantInfoServiceImpl.java
View File

@@ -647,7 +647,7 @@ public class PileMerchantInfoServiceImpl implements PileMerchantInfoService {
if (pileMerchantInfo != null) {
MerchantWithdrawalTypeVO merchantWithdrawalTypeVO = new MerchantWithdrawalTypeVO();
merchantWithdrawalTypeVO.setMerchantId(pileMerchantInfo.getId() + "");
merchantWithdrawalTypeVO.setWithdrawalType(pileMerchantInfo.getDelayMode());
merchantWithdrawalTypeVO.setWithdrawalType(pileMerchantInfo.getWithdrawalType());
merchantWithdrawalTypeVO.setReservedAmount(pileMerchantInfo.getReservedAmount());
return merchantWithdrawalTypeVO;
}
@@ -667,7 +667,7 @@ public class PileMerchantInfoServiceImpl implements PileMerchantInfoService {
}
merchantInfo.setUpdateBy(SecurityUtils.getUsername());
merchantInfo.setUpdateTime(DateUtils.getNowDate());
return pileMerchantInfoMapper.updatePileMerchantInfo(merchantInfo);
return pileMerchantInfoMapper.updateByPrimaryKeySelective(merchantInfo);
}
}