瀏覽代碼

钢结构

gqx 2 年之前
父節點
當前提交
ce151e9bb8

+ 10 - 5
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/BusRoomPayTypeController.java

@@ -9,6 +9,8 @@ import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import java.net.URLDecoder;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpServletResponse;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.constant.CommonConstant;
 import org.jeecg.common.constant.CommonConstant;
 import org.jeecg.common.exception.JeecgBootException;
 import org.jeecg.common.exception.JeecgBootException;
@@ -22,11 +24,9 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 
 
-import org.jeecg.modules.business.entity.BusHotel;
-import org.jeecg.modules.business.entity.BusParamXcxRoom;
-import org.jeecg.modules.business.entity.BusRoomPayType;
-import org.jeecg.modules.business.entity.BusSalesPerson;
+import org.jeecg.modules.business.entity.*;
 import org.jeecg.modules.business.service.IBusHotelService;
 import org.jeecg.modules.business.service.IBusHotelService;
+import org.jeecg.modules.business.service.IBusPayInterfaceConfigService;
 import org.jeecg.modules.business.service.IBusRoomPayTypeService;
 import org.jeecg.modules.business.service.IBusRoomPayTypeService;
 import org.jeecg.modules.system.entity.SysTenant;
 import org.jeecg.modules.system.entity.SysTenant;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
@@ -61,6 +61,8 @@ public class BusRoomPayTypeController extends JeecgController<BusRoomPayType, IB
 	private IBusRoomPayTypeService busRoomPayTypeService;
 	private IBusRoomPayTypeService busRoomPayTypeService;
 	 @Autowired
 	 @Autowired
 	 private IBusHotelService busHotelService;
 	 private IBusHotelService busHotelService;
+	 @Autowired
+	 private IBusPayInterfaceConfigService busPayInterfaceConfigService;
 	/**
 	/**
 	 * 分页列表查询
 	 * 分页列表查询
 	 *
 	 *
@@ -80,11 +82,14 @@ public class BusRoomPayTypeController extends JeecgController<BusRoomPayType, IB
 		QueryWrapper<BusRoomPayType> queryWrapper = QueryGenerator.initQueryWrapper(busRoomPayType, req.getParameterMap());
 		QueryWrapper<BusRoomPayType> queryWrapper = QueryGenerator.initQueryWrapper(busRoomPayType, req.getParameterMap());
 		Page<BusRoomPayType> page = new Page<BusRoomPayType>(pageNo, pageSize);
 		Page<BusRoomPayType> page = new Page<BusRoomPayType>(pageNo, pageSize);
 		IPage<BusRoomPayType> pageList = busRoomPayTypeService.page(page, queryWrapper);
 		IPage<BusRoomPayType> pageList = busRoomPayTypeService.page(page, queryWrapper);
-		pageList.getRecords().forEach(item->{
+		pageList.getRecords().forEach(item -> {
 			BusHotel busHotel = busHotelService.getById(item.getHotelId());
 			BusHotel busHotel = busHotelService.getById(item.getHotelId());
 			if (busHotel != null) {
 			if (busHotel != null) {
 				item.setHotelName(busHotel.getName());
 				item.setHotelName(busHotel.getName());
 			}
 			}
+			LambdaQueryWrapper<BusPayInterfaceConfig> busPayInterfaceConfigLambdaQueryWrapper = new LambdaQueryWrapper<>();
+			busPayInterfaceConfigLambdaQueryWrapper.eq(BusPayInterfaceConfig::getPayTypeId, item.getId());
+			item.setBusPayInterfaceConfig(busPayInterfaceConfigService.getOne(busPayInterfaceConfigLambdaQueryWrapper));
 		});
 		});
 		return Result.OK(pageList);
 		return Result.OK(pageList);
 	}
 	}

+ 3 - 0
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/entity/BusRoomPayType.java

@@ -90,4 +90,7 @@ public class BusRoomPayType implements Serializable {
 
 
     @TableField(exist = false)
     @TableField(exist = false)
     private BigDecimal amount;
     private BigDecimal amount;
+
+    @TableField(exist = false)
+    private  BusPayInterfaceConfig busPayInterfaceConfig;
 }
 }