Merge branch 'master' of http://49.4.53.36:3000/hotel/hotel-saas-backend

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/finance/controller/SummaryController.java

@@ -27,6 +27,7 @@ import org.jeecg.modules.rooms.entity.CesRoomLayoutPriceDate;
 import org.jeecg.modules.rooms.entity.CesRooms;
 import org.jeecg.modules.rooms.service.CesRoomsServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
 
@@ -66,8 +67,8 @@ public class SummaryController {
 	public Result<IPage<HashMap<String, Object>>> getFinanceSummarizationPage(PosOrderGoodsPayment posOrderGoodsPayment,
 																			  @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
 																			  @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
-																			  @RequestParam(name = "startTime", required = false) @JsonFormat() DateTime startTime,
-																			  @RequestParam(name = "endTime", required = false) @JsonFormat() DateTime endTime,
+																			  @RequestParam(name = "startTime", required = false) @JsonFormat(pattern = "yyyy-MM-dd")  @DateTimeFormat(pattern="yyyy-MM-dd") DateTime startTime,
+																			  @RequestParam(name = "endTime", required = false) @JsonFormat(pattern = "yyyy-MM-dd")  @DateTimeFormat(pattern="yyyy-MM-dd") DateTime endTime,
 																			  @RequestParam(name = "departmentId", defaultValue = "0") Integer departmentId,
 																			  HttpServletRequest req) {
 		Page<HashMap<String, Object>> page = new Page<HashMap<String, Object>>(pageNo, pageSize);
@@ -91,8 +92,8 @@ public class SummaryController {
 	public Result<IPage<HashMap<String, Object>>> getFinancePageList(PosOrderGoodsPayment posOrderGoodsPayment,
 																			  @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
 																			  @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
-																			  @RequestParam(name = "startTime", required = false) @JsonFormat() DateTime startTime,
-																			  @RequestParam(name = "endTime", required = false) @JsonFormat() DateTime endTime,
+																			  @RequestParam(name = "startTime", required = false) @JsonFormat(pattern = "yyyy-MM-dd")  @DateTimeFormat(pattern="yyyy-MM-dd") DateTime startTime,
+																			  @RequestParam(name = "endTime", required = false) @JsonFormat(pattern = "yyyy-MM-dd")  @DateTimeFormat(pattern="yyyy-MM-dd") DateTime endTime,
 																			  @RequestParam(name = "departmentId", defaultValue = "0") Integer departmentId,
 																			  HttpServletRequest req) {
 		Page<HashMap<String, Object>> page = new Page<HashMap<String, Object>>(pageNo, pageSize);

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/finance/mapper/SummaryMapper.java

@@ -68,9 +68,9 @@ public interface SummaryMapper extends BaseMapper<PosOrderGoodsPayment>  {
      * @param endTime
      * @return
      */
-    @Select("<script>select max(h.name) as hotel_name,'POS' as department,\n" +
+    @Select("<script>select max(h.name) as hotel_name,'POS' as department\n" +
             "<foreach item='item' index='index' collection='busRoomPayTypes' open=',' separator=',' close=' '>"+
-            "SUM(case ogp.payment_method when '${item.id}' then ogp.pay_money else 0 end) as '${item.name}',\n" +
+            "SUM(case ogp.payment_method when '${item.id}' then ogp.pay_money else 0 end) as '${item.name}'\n" +
             "</foreach>"+
             "from bus_hotel_info h\n" +
             "inner join bus_room_pay_type_info pty on h.id=pty.hotel_id\n" +
@@ -91,9 +91,9 @@ public interface SummaryMapper extends BaseMapper<PosOrderGoodsPayment>  {
      * @param endTime
      * @return
      */
-    @Select("<script>select max(h.name) as hotel_name,'客房' as department,\n" +
+    @Select("<script>select max(h.name) as hotel_name,'客房' as department\n" +
             "<foreach item='item' index='index' collection='busRoomPayTypes' open=',' separator=',' close=' '>"+
-            "SUM(case of.pay_type when '${item.id}' then of.money else 0 end) as '${item.name}',\n" +
+            "SUM(case of.pay_type when '${item.id}' then of.money else 0 end) as '${item.name}'\n" +
             "</foreach>"+
             "from bus_hotel_info h\n" +
             "inner join bus_room_pay_type_info pty on h.id=pty.hotel_id\n" +

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/pos/controller/PosOrderGoodsController.java

@@ -19,6 +19,9 @@ import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.util.TokenUtils;
 import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.business.entity.BusOrderFee;
+import org.jeecg.modules.business.enums.FeeSubjectType;
+import org.jeecg.modules.business.service.IBusRoomBookingOrdersService;
 import org.jeecg.modules.pos.entity.*;
 import org.jeecg.modules.pos.service.*;
 
@@ -69,6 +72,8 @@ private IPosTypeService posTypeService;
 private IPosOrderGoodsPaymentService posOrderGoodsPaymentService;
 @Autowired
 private IPosTableService posTableService;
+@Autowired
+private  IBusRoomBookingOrdersService busRoomBookingOrdersService;
 	/**
 	 * 分页列表查询
 	 *
@@ -162,11 +167,6 @@ private IPosTableService posTableService;
 			 posOrderGoods.setPosTableId(tableId);
 			 posOrderGoods.setTableNo(tableNo);
 		 }
-		 if (ObjectUtils.isNotEmpty(posOrderGoods.getToRoomFeeOrderId())) {
-			 posOrderGoods.setStatus(1);
-			 posOrderGoods.setSettleTime(new Date());
-			 posOrderGoods.setPayInfo("挂房账");
-		 }
 		 posOrderGoods.setTenantId(TokenUtils.currentTenantId());
 		 BigDecimal amount = BigDecimal.ZERO;
 		 for (PosOrderGoodsDetail posOrderGoodsDetail : posOrderGoods.getPosOrderGoodsDetailList()) {
@@ -181,6 +181,19 @@ private IPosTableService posTableService;
 		 posOrderGoods.setMoney(amount);
 		 posOrderGoods.setConsumeMoney(amount);
 		 posOrderGoods.setCreateTime(new Date());
+
+		 if (ObjectUtils.isNotEmpty(posOrderGoods.getToRoomFeeOrderId())) {
+			 posOrderGoods.setStatus(1);
+			 posOrderGoods.setSettleTime(new Date());
+			 posOrderGoods.setPayInfo("挂房账");
+
+			 List<BusOrderFee> fees = new ArrayList<>();
+			 BusOrderFee busOrderFee = new BusOrderFee();
+			 busOrderFee.setMoney(posOrderGoods.getMoney());
+			 busOrderFee.setSubjectType(FeeSubjectType.DIAN_PIN.getKey());
+			 fees.add(busOrderFee);
+			 busRoomBookingOrdersService.setLivingOrderFee(fees, posOrderGoods.getToRoomFeeOrderId());
+		 }
 		 Boolean res = posOrderGoodsService.saveOrUpdate(posOrderGoods);
 		 if (res) {
 			 LambdaQueryWrapper<PosOrderGoodsDetail> lambdaQueryWrapper = new LambdaQueryWrapper<>();