|
@@ -663,8 +663,11 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
if(!(ws.getIsPay() != null && ws.getIsPay().intValue() == 1)){
|
|
if(!(ws.getIsPay() != null && ws.getIsPay().intValue() == 1)){
|
|
|
|
|
+ System.out.println("进支付比较");
|
|
|
List<JsonPayVo> payInfos = WelcomePayController.queryStudentPayInfo(ws.getAdmissNum(),TimeExchange.getYear());
|
|
List<JsonPayVo> payInfos = WelcomePayController.queryStudentPayInfo(ws.getAdmissNum(),TimeExchange.getYear());
|
|
|
|
|
+ System.out.println("进支付比较1"+JSON.toJSON(payInfos));
|
|
|
if(payInfos != null && payInfos.size() > 0){
|
|
if(payInfos != null && payInfos.size() > 0){
|
|
|
|
|
+ System.out.println("进支付比较2");
|
|
|
List<WelcomePaySetting> paySettings = welcomePaySettingService.queryPaySettings(ws.getSchool());
|
|
List<WelcomePaySetting> paySettings = welcomePaySettingService.queryPaySettings(ws.getSchool());
|
|
|
if(paySettings != null && paySettings.size() > 0){
|
|
if(paySettings != null && paySettings.size() > 0){
|
|
|
for (WelcomePaySetting pay:paySettings) {
|
|
for (WelcomePaySetting pay:paySettings) {
|