diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileMerchantInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileMerchantInfoServiceImpl.java index 2fe11aa91..fd3d27801 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileMerchantInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileMerchantInfoServiceImpl.java @@ -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; } diff --git a/jsowell-pile/src/main/resources/mapper/pile/PileMerchantInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/PileMerchantInfoMapper.xml index f1477202e..aa4985322 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/PileMerchantInfoMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/PileMerchantInfoMapper.xml @@ -29,14 +29,14 @@ - id, merchant_name, merchant_level, parent_id, address, dept_id, `status`, delay_mode, - organization_code, manager_name, manager_phone, service_phone, logo_url, app_id, - alipay_app_id, withdrawal_type, reserved_amount, create_by, create_time, update_by, + id, merchant_name, merchant_level, parent_id, address, dept_id, `status`, delay_mode, + organization_code, manager_name, manager_phone, service_phone, logo_url, app_id, + alipay_app_id, withdrawal_type, reserved_amount, create_by, create_time, update_by, update_time, del_flag + - where id = #{id} - select from pile_merchant_info - where id in + where id in #{merchantId,jdbcType=VARCHAR} @@ -1125,7 +1125,7 @@ - select from pile_merchant_info @@ -1149,7 +1149,7 @@ - select from pile_merchant_info @@ -1157,7 +1157,7 @@ and dept_id = #{deptId,jdbcType=VARCHAR} - select from @@ -1171,7 +1171,7 @@ - select from @@ -1180,7 +1180,7 @@ and merchant_level = '1' - select from @@ -1190,7 +1190,7 @@ and app_id = #{wxAppId,jdbcType=VARCHAR} - select from @@ -1248,7 +1248,7 @@ - select from pile_merchant_info where del_flag = '0' @@ -1269,4 +1269,4 @@ AND t1.id = #{stationId,jdbcType=VARCHAR} - \ No newline at end of file +