处理文档中提出的问题

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/BusBookingRoomsController.java

@@ -50,7 +50,7 @@ import org.apache.shiro.authz.annotation.RequiresPermissions;
 public class BusBookingRoomsController extends JeecgController<BusBookingRooms, IBusBookingRoomsService> {
 	@Autowired
 	private IBusBookingRoomsService busBookingRoomsService;
-	
+
 	/**
 	 * 分页列表查询
 	 *
@@ -112,8 +112,8 @@ public class BusBookingRoomsController extends JeecgController<BusBookingRooms,
 	 @ApiOperation(value="预定关联房间-设置为主房", notes="预定关联房间-设置为主房")
 	 //@RequiresPermissions("business:bus_booking_rooms:edit")
 	 @RequestMapping(value = "/set-main", method = {RequestMethod.PUT,RequestMethod.POST})
-	 public Result<String> setMain(@RequestBody BusBookingRooms busBookingRooms) {
-		 busBookingRoomsService.setMain(busBookingRooms.getId());
+	 public Result<String> setMain(@RequestBody BusBookingRooms busBookingRooms, String livingOrderId) {
+		 busBookingRoomsService.setMain(busBookingRooms.getId(), livingOrderId);
 		 return Result.OK("编辑成功!");
 	 }
 
@@ -122,8 +122,7 @@ public class BusBookingRoomsController extends JeecgController<BusBookingRooms,
 	 *
 	 * @param id
 	 * @return
-	 */
-	@AutoLog(value = "预定订单关联房间-通过id删除")
+	 */	@AutoLog(value = "预定订单关联房间-通过id删除")
 	@ApiOperation(value="预定订单关联房间-通过id删除", notes="预定订单关联房间-通过id删除")
 	//@RequiresPermissions("business:bus_booking_rooms:delete")
 	@DeleteMapping(value = "/delete")

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/BusLivingCustomerController.java

@@ -29,6 +29,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
 
+import org.jeecg.modules.business.vo.BusLivingCustomerVo;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -96,7 +97,7 @@ public class BusLivingCustomerController extends JeecgController<BusLivingCustom
 	//@RequiresPermissions("business:bus_living_customer:add")
 	@Transactional(rollbackFor = Exception.class)
 	@PostMapping(value = "/add")
-	public Result<String> add(@RequestBody BusLivingCustomer s) {
+	public Result<String> add(@RequestBody BusLivingCustomerVo s) {
 		if(s.getCustomerName() != null && !s.getCustomerName().isEmpty() && s.getPhone() != null && !s.getPhone().isEmpty()){
 			BusCustomer customer = customerService.getOne(Wrappers.<BusCustomer>query().eq("name",s.getCustomerName())
 					.eq("phone",s.getPhone()));
@@ -110,6 +111,7 @@ public class BusLivingCustomerController extends JeecgController<BusLivingCustom
 				newCustomer.setName(s.getCustomerName());
 				newCustomer.setPhone(s.getPhone());
 				newCustomer.setCertType(1); // 身份证
+				newCustomer.setNation(s.getNation());
 				customerService.save(newCustomer);
 				s.setCustomerId(newCustomer.getId());
 			} else {

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/BusMemberCardController.java

@@ -10,6 +10,7 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import com.alibaba.druid.support.json.JSONUtils;
@@ -68,6 +69,8 @@ import org.jeecg.common.aspect.annotation.AutoLog;
 public class BusMemberCardController extends JeecgController<BusMemberCard, IBusMemberCardService> {
 	@Autowired
 	private IBusMemberCardService busMemberCardService;
+	@Resource
+	private IBusCustomerService busCustomerService;
 	 @Autowired
 	 private IBusHotelService busHotelService;
 	 @Autowired
@@ -183,6 +186,16 @@ public class BusMemberCardController extends JeecgController<BusMemberCard, IBus
 			busMemberCard.setUserId(mallUserInfo.getId());
 		}
 		busMemberCardService.save(busMemberCard);
+		BusCustomer busCustomer = new BusCustomer();
+		busCustomer.setRelationVipId(busMemberCard.getId());
+		busCustomer.setName(busMemberCard.getName());
+		busCustomer.setGender(busMemberCard.getSex());
+		busCustomer.setPhone(busMemberCard.getMobile());
+		busCustomer.setCertType(busMemberCard.getCertificateType());
+		busCustomer.setCertNo(busMemberCard.getCertificateNo());
+		busCustomer.setPhone(busMemberCard.getMobile());
+		busCustomer.setAddress(busMemberCard.getAddress());
+		busCustomerService.save(busCustomer);
 		return Result.OK("添加成功！");
 	}
 

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/dto/UpdateOrderInfoDto.java

@@ -6,7 +6,12 @@ import lombok.Data;
 public class UpdateOrderInfoDto {
     private String orderId;
     private String cusName;
+    private Integer gender;
     private String cusPhone;
+    private String address;
+    private String nation;
+    private Integer certType;
+    private String certNo;
     private String cusId;
     private Integer customerType;
     private String customerSource;

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/entity/BusCustomer.java

@@ -56,6 +56,14 @@ public class BusCustomer implements Serializable {
 	@Excel(name = "手机号", width = 15)
     @ApiModelProperty(value = "手机号")
     private String phone;
+    /**地址*/
+    @Excel(name = "地址", width = 15)
+    @ApiModelProperty(value = "地址")
+    private String address;
+    /**地址*/
+    @Excel(name = "民族", width = 15)
+    @ApiModelProperty(value = "民族")
+    private String nation;
 	/**关联会员id*/
 	@Excel(name = "关联会员id", width = 15)
     @ApiModelProperty(value = "关联会员id")

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/BusLivingCustomerMapper.java

@@ -3,8 +3,10 @@ package org.jeecg.modules.business.mapper;
 import java.util.List;
 
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 import org.jeecg.modules.business.entity.BusLivingCustomer;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.business.vo.BusLivingCustomerVo;
 
 /**
  * @Description: bus_living_customer
@@ -14,4 +16,11 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface BusLivingCustomerMapper extends BaseMapper<BusLivingCustomer> {
 
+    @Select("<script> select blc.*,bc.address ,bc.nation from bus_living_customer blc " +
+            "inner join bus_customer bc on blc.customer_id = bc.id " +
+            "where blc.living_order_id in" +
+            "<foreach item='id' index='index' collection='livingOrderIds' open='(' separator=',' close=')'> " +
+            "#{id} </foreach> </script>")
+    List<BusLivingCustomerVo> queryCustomVoList(List<String> livingOrderIds);
+
 }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/IBusBookingRoomsService.java

@@ -16,5 +16,5 @@ import java.util.List;
 public interface IBusBookingRoomsService extends IService<BusBookingRooms> {
 
     List<ExtendBusBookingRoomsVo> bookingRooms(String bookingId, Integer type);
-    Boolean setMain(String relationRoomId);
+    Boolean setMain(String bookingRoomsId, String livingOrderId);
 }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/IBusLivingCustomerService.java

@@ -2,6 +2,9 @@ package org.jeecg.modules.business.service;
 
 import org.jeecg.modules.business.entity.BusLivingCustomer;
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.business.vo.BusLivingCustomerVo;
+
+import java.util.List;
 
 /**
  * @Description: bus_living_customer
@@ -10,5 +13,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @Version: V1.0
  */
 public interface IBusLivingCustomerService extends IService<BusLivingCustomer> {
-
+    List<BusLivingCustomerVo> queryCustomVoList(List<String> livingOrderIds);
 }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/BusBookingRoomsServiceImpl.java

@@ -3,13 +3,17 @@ package org.jeecg.modules.business.service.impl;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import org.jeecg.common.exception.JeecgBootException;
 import org.jeecg.modules.business.entity.BusBookingRooms;
+import org.jeecg.modules.business.entity.BusRoomsLivingOrder;
+import org.jeecg.modules.business.enums.SettleTypeEnum;
 import org.jeecg.modules.business.mapper.BusBookingRoomsMapper;
 import org.jeecg.modules.business.service.IBusBookingRoomsService;
+import org.jeecg.modules.business.service.IBusRoomsLivingOrderService;
 import org.jeecg.modules.business.vo.ExtendBusBookingRoomsVo;
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
+import javax.annotation.Resource;
 import java.util.List;
 
 /**
@@ -21,15 +25,30 @@ import java.util.List;
 @Service
 public class BusBookingRoomsServiceImpl extends ServiceImpl<BusBookingRoomsMapper, BusBookingRooms> implements IBusBookingRoomsService {
 
+    @Resource
+    private IBusRoomsLivingOrderService livingOrderService;
+
     @Override
     public List<ExtendBusBookingRoomsVo> bookingRooms(String bookingId,Integer type) {
         return baseMapper.bookingRooms(bookingId,type);
     }
 
     @Override
-    public Boolean setMain(String relationRoomId) {
-        BusBookingRooms roomR =  getById(relationRoomId);
+    public Boolean setMain(String bookingRoomsId, String livingOrderId) {
+        BusBookingRooms roomR =  getById(bookingRoomsId);
         if(roomR==null) throw new JeecgBootException("未找到房间");
+        if (roomR.getIsMain()){
+            throw new JeecgBootException("该房间已是主房");
+        }
+        if (livingOrderId != null || !livingOrderId.isEmpty()){
+            BusRoomsLivingOrder livingOrder = livingOrderService.getById(livingOrderId);
+            if (livingOrder == null){
+                throw new JeecgBootException("订单不存在");
+            }
+            if (!SettleTypeEnum.UN_LEAVE.getKey().equals(livingOrder.getSettleType())){
+                throw new JeecgBootException("退房的房间不能设置为主房");
+            }
+        }
         baseMapper.setNotMain(roomR.getBookingOrdersId());
         roomR.setIsMain(true);
         updateById(roomR);

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/BusLivingCustomerServiceImpl.java

@@ -3,10 +3,13 @@ package org.jeecg.modules.business.service.impl;
 import org.jeecg.modules.business.entity.BusLivingCustomer;
 import org.jeecg.modules.business.mapper.BusLivingCustomerMapper;
 import org.jeecg.modules.business.service.IBusLivingCustomerService;
+import org.jeecg.modules.business.vo.BusLivingCustomerVo;
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
+import java.util.List;
+
 /**
  * @Description: bus_living_customer
  * @Author: jeecg-boot
@@ -15,5 +18,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
  */
 @Service
 public class BusLivingCustomerServiceImpl extends ServiceImpl<BusLivingCustomerMapper, BusLivingCustomer> implements IBusLivingCustomerService {
-
+    @Override
+    public List<BusLivingCustomerVo> queryCustomVoList(List<String> livingOrderIds){
+        return this.baseMapper.queryCustomVoList(livingOrderIds);
+    }
 }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/BusRoomBookingOrdersServiceImpl.java

@@ -469,8 +469,7 @@ public class BusRoomBookingOrdersServiceImpl extends ServiceImpl<BusRoomBookingO
                     roomsLivingOrderService.list(Wrappers.<BusRoomsLivingOrder>query()
                     .eq("booking_order_id",orderId)): new ArrayList<>();
             List<String> livingOrderIds = livingOrders.stream().map(r->r.getId()).collect(Collectors.toList());
-            List<BusLivingCustomer> livingCustomers =livingOrderIds.size()>0? livingCustomerService.list(Wrappers.<BusLivingCustomer>query()
-            .in("living_order_id", livingOrderIds)):new ArrayList<>();
+            List<BusLivingCustomerVo> livingCustomers = livingOrderIds.size()>0? livingCustomerService.queryCustomVoList(livingOrderIds):new ArrayList<>();
             livingRooms.forEach(r->{
                 Optional<BusRoomsLivingOrder> opLvOrder = livingOrders.stream().filter(a->a.getBookingRoomId().equals(r.getId())).findFirst();
 
@@ -488,7 +487,7 @@ public class BusRoomBookingOrdersServiceImpl extends ServiceImpl<BusRoomBookingO
                         int daysBetween = (int) TimeUnit.DAYS.convert(millisDiff, TimeUnit.MILLISECONDS) + 1;
                         order.setDayCount(daysBetween);
                     }
-                    List<BusLivingCustomer> currentLivingCustomers = livingCustomers.stream().filter(s->s.getLivingOrderId().equals(order.getId())).collect(Collectors.toList());
+                    List<BusLivingCustomerVo> currentLivingCustomers = livingCustomers.stream().filter(s->s.getLivingOrderId().equals(order.getId())).collect(Collectors.toList());
                     List<BusLivingLayoutDayPrice> lvDayPrices = livingLayoutDayPriceService.list(Wrappers.<BusLivingLayoutDayPrice>query().eq("living_order_id",order.getId()));
                     r.setLivingOrder(order);
                     r.setLivingDayPrices(lvDayPrices);
@@ -1908,7 +1907,11 @@ public class BusRoomBookingOrdersServiceImpl extends ServiceImpl<BusRoomBookingO
                     newCustomer.setTenantId(user.getRelTenantIds());
                     newCustomer.setName(info.getCusName());
                     newCustomer.setPhone(info.getCusPhone());
-                    newCustomer.setCertType(1); // 身份证
+                    newCustomer.setGender(info.getGender());
+                    newCustomer.setCertNo(info.getCertNo());
+                    newCustomer.setCertType(info.getCertType());
+                    newCustomer.setAddress(info.getAddress());
+                    newCustomer.setNation(info.getNation());
                     customerService.save(newCustomer);
                     customer = newCustomer;
                     order.setContactId(newCustomer.getId());
@@ -1920,7 +1923,9 @@ public class BusRoomBookingOrdersServiceImpl extends ServiceImpl<BusRoomBookingO
                     BusLivingCustomer firstCustomer = customers.get(0);
                     firstCustomer.setCustomerId(customer.getId());
                     firstCustomer.setCustomerName(customer.getName());
+                    firstCustomer.setGender(customer.getGender());
                     firstCustomer.setPhone(customer.getPhone());
+                    firstCustomer.setCertType(customer.getCertType());
                     firstCustomer.setCertNo(customer.getCertNo());
                     livingCustomerService.updateById(firstCustomer);
                 }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/vo/BusLivingCustomerVo.java

@@ -0,0 +1,15 @@
+package org.jeecg.modules.business.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.jeecg.modules.business.entity.BusLivingCustomer;
+
+@Data
+public class BusLivingCustomerVo extends BusLivingCustomer {
+
+    @ApiModelProperty(value = "地址")
+    private String address;
+    @ApiModelProperty(value = "民族")
+    private String nation;
+
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/vo/ExtendBusBookingRoomsVo.java

@@ -13,5 +13,5 @@ public class ExtendBusBookingRoomsVo extends BusBookingRooms {
     private List<BusBookingLayoutDayPrice> layoutDayPrices;
     private List<BusLivingLayoutDayPrice> livingDayPrices;
     private BusRoomsLivingOrder livingOrder;
-    private List<BusLivingCustomer> livingCustomers;
+    private List<BusLivingCustomerVo> livingCustomers;
 }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/rooms/Vo/LivingRealtimeVo.java

@@ -1,6 +1,7 @@
 package org.jeecg.modules.rooms.Vo;
 
 import lombok.Data;
+import org.jeecg.modules.business.entity.BusCustomer;
 import org.jeecg.modules.business.entity.BusLivingCustomer;
 import org.jeecg.modules.business.entity.BusLivingLayoutDayPrice;
 import org.jeecg.modules.business.entity.BusRoomsLivingOrder;
@@ -11,5 +12,6 @@ import java.util.List;
 public class LivingRealtimeVo {
     private BusRoomsLivingOrder livingOrder;
     private BusLivingCustomer livingCustomers;
+    private BusCustomer customer;
     private List<BusLivingLayoutDayPrice> price;
 }