新增订单水电记录表

src/main/java/com/template/AutoCode.java

@@ -56,7 +56,7 @@ public class AutoCode {
         mpg.setPackageInfo(pc);
         //4、策略配置
         StrategyConfig strategy = new StrategyConfig();
-        strategy.setInclude("total_card"); // 设置要映射的表名
+        strategy.setInclude("house_order_bill"); // 设置要映射的表名
         strategy.setNaming(NamingStrategy.underline_to_camel);//下划线转驼峰
         strategy.setColumnNaming(NamingStrategy.underline_to_camel);//下划线转驼峰
         strategy.setEntityLombokModel(true); // 自动lombok；

src/main/java/com/template/controller/HouseNumberStateController.java

@@ -1223,14 +1223,20 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
             String live = sdf.format(liveTime);
             String leave = sdf.format(new Date());
 //                获取电的消费金额和额度
+            HouseOrderBill houseOrderBill = new HouseOrderBill();
             JSONObject jsonObjectElectric = electricEquipmentService.roomCostRecord(electricEquipmentRoomId, live, leave);
             BigDecimal costElectric = jsonObjectElectric.getBigDecimal("cost");
             BigDecimal consumeElectric = jsonObjectElectric.getBigDecimal("consume");
+            houseOrderBill.setElectricCost(costElectric);
+            houseOrderBill.setElectricConsume(consumeElectric);
+
+
             BigDecimal electricCost = houseOrder.getElectricCost();
             if (ObjectUtils.isNotEmpty(electricCost)) {
                 costElectric = costElectric.add(electricCost);
             }
             BigDecimal electricConsume = houseOrder.getElectricConsume();
+
             if (ObjectUtils.isNotEmpty(electricConsume)) {
                 consumeElectric = consumeElectric.add(electricConsume);
             }
@@ -1240,6 +1246,10 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
             JSONObject jsonObjectWater = waterEquipmentService.roomCostRecord(waterEquipmentRoomId, live, leave);
             BigDecimal costWater = jsonObjectWater.getBigDecimal("cost");
             BigDecimal consumeWater = jsonObjectWater.getBigDecimal("consume");
+            houseOrderBill.setWaterCost(costWater);
+            houseOrderBill.setWaterConsume(consumeWater);
+
+
             BigDecimal waterCost = houseOrder.getWaterCost();
             if (ObjectUtils.isNotEmpty(waterCost)) {
                 costWater = costWater.add(waterCost);
@@ -1251,6 +1261,14 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
 
             houseOrder.setWaterCost(costWater);
             houseOrder.setWaterConsume(consumeWater);
+
+
+            houseOrderBill.setHouseOrderId(houseOrder.getId());
+            houseOrderBill.setHouseNumberId(initialHouseNumberId);
+            houseOrderBill.setLiveTime(liveTime);
+            houseOrderBill.setLeaveTime(date);
+            houseOrderBillService.save(houseOrderBill);
+
         }
 
 
@@ -1472,9 +1490,14 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
                 String live = sdf.format(liveTime);
                 String leave = sdf.format(new Date());
 //                获取电的消费金额和额度
+                HouseOrderBill houseOrderBill = new HouseOrderBill();
                 JSONObject jsonObjectElectric = electricEquipmentService.roomCostRecord(electricEquipmentRoomId, live, leave);
                 BigDecimal costElectric = jsonObjectElectric.getBigDecimal("cost");
                 BigDecimal consumeElectric = jsonObjectElectric.getBigDecimal("consume");
+                houseOrderBill.setElectricCost(costElectric);
+                houseOrderBill.setElectricConsume(consumeElectric);
+
+
                 BigDecimal electricCost = houseOrder.getElectricCost();
                 if (ObjectUtils.isNotEmpty(electricCost)) {
                     costElectric = costElectric.add(electricCost);
@@ -1489,6 +1512,10 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
                 JSONObject jsonObjectWater = waterEquipmentService.roomCostRecord(waterEquipmentRoomId, live, leave);
                 BigDecimal costWater = jsonObjectWater.getBigDecimal("cost");
                 BigDecimal consumeWater = jsonObjectWater.getBigDecimal("consume");
+                houseOrderBill.setWaterCost(costWater);
+                houseOrderBill.setWaterConsume(consumeWater);
+
+
                 BigDecimal waterCost = houseOrder.getWaterCost();
                 if (ObjectUtils.isNotEmpty(waterCost)) {
                     costWater = costWater.add(waterCost);
@@ -1501,6 +1528,13 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
                 houseOrder.setWaterCost(costWater);
                 houseOrder.setWaterConsume(consumeWater);
 
+                houseOrderBill.setHouseOrderId(houseOrder.getId());
+                houseOrderBill.setHouseNumberId(houseNumberId);
+                houseOrderBill.setLiveTime(liveTime);
+                houseOrderBill.setLeaveTime(new Date());
+                houseOrderBillService.save(houseOrderBill);
+
+
             }
 
             LambdaQueryWrapper<Unlocking> wrapperU = new LambdaQueryWrapper<>();
@@ -1542,9 +1576,14 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
             String live = sdf.format(liveTime);
             String leave = sdf.format(new Date());
 //                获取电的消费金额和额度
+            HouseOrderBill houseOrderBill = new HouseOrderBill();
             JSONObject jsonObjectElectric = electricEquipmentService.roomCostRecord(electricEquipmentRoomId, live, leave);
             BigDecimal costElectric = jsonObjectElectric.getBigDecimal("cost");
             BigDecimal consumeElectric = jsonObjectElectric.getBigDecimal("consume");
+            houseOrderBill.setElectricCost(costElectric);
+            houseOrderBill.setElectricConsume(consumeElectric);
+
+
             BigDecimal electricCost = houseOrder.getElectricCost();
             if (ObjectUtils.isNotEmpty(electricCost)) {
                 costElectric = costElectric.add(electricCost);
@@ -1559,6 +1598,10 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
             JSONObject jsonObjectWater = waterEquipmentService.roomCostRecord(waterEquipmentRoomId, live, leave);
             BigDecimal costWater = jsonObjectWater.getBigDecimal("cost");
             BigDecimal consumeWater = jsonObjectWater.getBigDecimal("consume");
+            houseOrderBill.setWaterCost(costWater);
+            houseOrderBill.setWaterConsume(consumeWater);
+
+
             BigDecimal waterCost = houseOrder.getWaterCost();
             if (ObjectUtils.isNotEmpty(waterCost)) {
                 costWater = costWater.add(waterCost);
@@ -1571,6 +1614,14 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
             houseOrder.setWaterCost(costWater);
             houseOrder.setWaterConsume(consumeWater);
 
+
+            houseOrderBill.setHouseOrderId(houseOrder.getId());
+            houseOrderBill.setHouseNumberId(houseNumberId);
+            houseOrderBill.setLiveTime(liveTime);
+            houseOrderBill.setLeaveTime(new Date());
+            houseOrderBillService.save(houseOrderBill);
+
+
         }
 
 

src/main/java/com/template/controller/HouseOrderController.java

@@ -161,6 +161,9 @@ public class HouseOrderController implements HouseOrderAPI {
     @Autowired
     ApplicationProcedureTemporaryService applicationProcedureTemporaryService;
 
+    @Autowired
+    HouseOrderBillService houseOrderBillService;
+
     @Override
     public CommonResult getHouseOrderPrice(int houseOrderNumber, String userId, String houseId, String liveTime, String leaveTime, Integer source) {
         if (ObjectUtils.isEmpty(userId) && ObjectUtils.isEmpty(houseId) && ObjectUtils.isEmpty(leaveTime) && ObjectUtils.isEmpty(leaveTime) && ObjectUtils.isEmpty(houseOrderNumber) && houseOrderNumber <= 0) {
@@ -1109,9 +1112,15 @@ public class HouseOrderController implements HouseOrderAPI {
                 String live = sdf.format(liveTime);
                 String leave = sdf.format(new Date());
 //                获取电的消费金额和额度
+                HouseOrderBill houseOrderBill = new HouseOrderBill();
+
                 JSONObject jsonObjectElectric = electricEquipmentService.roomCostRecord(electricEquipmentRoomId, live, leave);
                 BigDecimal costElectric = jsonObjectElectric.getBigDecimal("cost");
                 BigDecimal consumeElectric = jsonObjectElectric.getBigDecimal("consume");
+                houseOrderBill.setElectricCost(costElectric);
+                houseOrderBill.setElectricConsume(consumeElectric);
+
+
                 BigDecimal electricCost = houseOrder.getElectricCost();
                 if (ObjectUtils.isNotEmpty(electricCost)) {
                     costElectric = costElectric.add(electricCost);
@@ -1126,6 +1135,10 @@ public class HouseOrderController implements HouseOrderAPI {
                 JSONObject jsonObjectWater = waterEquipmentService.roomCostRecord(waterEquipmentRoomId, live, leave);
                 BigDecimal costWater = jsonObjectWater.getBigDecimal("cost");
                 BigDecimal consumeWater = jsonObjectWater.getBigDecimal("consume");
+                houseOrderBill.setWaterCost(costWater);
+                houseOrderBill.setWaterConsume(consumeWater);
+
+
                 BigDecimal waterCost = houseOrder.getWaterCost();
                 if (ObjectUtils.isNotEmpty(waterCost)) {
                     costWater = costWater.add(waterCost);
@@ -1138,6 +1151,15 @@ public class HouseOrderController implements HouseOrderAPI {
                 houseOrder.setWaterCost(costWater);
                 houseOrder.setWaterConsume(consumeWater);
 
+
+                houseOrderBill.setHouseOrderId(houseOrder.getId());
+                houseOrderBill.setHouseNumberId(houseNumberId);
+                houseOrderBill.setLiveTime(liveTime);
+                houseOrderBill.setLeaveTime(new Date());
+                houseOrderBillService.save(houseOrderBill);
+
+
+
             }
             LambdaQueryWrapper<Unlocking> wrapperU = new LambdaQueryWrapper<>();
             wrapperU.eq(Unlocking::getOrderNumber, orderNumber)
@@ -1181,9 +1203,15 @@ public class HouseOrderController implements HouseOrderAPI {
             String live = sdf.format(liveTime);
             String leave = sdf.format(new Date());
 //                获取电的消费金额和额度
+            HouseOrderBill houseOrderBill = new HouseOrderBill();
+
             JSONObject jsonObjectElectric = electricEquipmentService.roomCostRecord(electricEquipmentRoomId, live, leave);
             BigDecimal costElectric = jsonObjectElectric.getBigDecimal("cost");
             BigDecimal consumeElectric = jsonObjectElectric.getBigDecimal("consume");
+            houseOrderBill.setElectricCost(costElectric);
+            houseOrderBill.setElectricConsume(consumeElectric);
+
+
             BigDecimal electricCost = houseOrder.getElectricCost();
             if (ObjectUtils.isNotEmpty(electricCost)) {
                 costElectric = costElectric.add(electricCost);
@@ -1198,6 +1226,10 @@ public class HouseOrderController implements HouseOrderAPI {
             JSONObject jsonObjectWater = waterEquipmentService.roomCostRecord(waterEquipmentRoomId, live, leave);
             BigDecimal costWater = jsonObjectWater.getBigDecimal("cost");
             BigDecimal consumeWater = jsonObjectWater.getBigDecimal("consume");
+            houseOrderBill.setWaterCost(costWater);
+            houseOrderBill.setWaterConsume(consumeWater);
+
+
             BigDecimal waterCost = houseOrder.getWaterCost();
             if (ObjectUtils.isNotEmpty(waterCost)) {
                 costWater = costWater.add(waterCost);
@@ -1210,6 +1242,13 @@ public class HouseOrderController implements HouseOrderAPI {
             houseOrder.setWaterCost(costWater);
             houseOrder.setWaterConsume(consumeWater);
 
+
+            houseOrderBill.setHouseOrderId(houseOrder.getId());
+            houseOrderBill.setHouseNumberId(houseNumberId);
+            houseOrderBill.setLiveTime(liveTime);
+            houseOrderBill.setLeaveTime(new Date());
+            houseOrderBillService.save(houseOrderBill);
+
         }
 
 
@@ -1315,9 +1354,14 @@ public class HouseOrderController implements HouseOrderAPI {
             String live = sdf.format(liveTime);
             String leave = sdf.format(new Date());
 //                获取电的消费金额和额度
+            HouseOrderBill houseOrderBill = new HouseOrderBill();
+
             JSONObject jsonObjectElectric = electricEquipmentService.roomCostRecord(electricEquipmentRoomId, live, leave);
             BigDecimal costElectric = jsonObjectElectric.getBigDecimal("cost");
             BigDecimal consumeElectric = jsonObjectElectric.getBigDecimal("consume");
+            houseOrderBill.setElectricCost(costElectric);
+            houseOrderBill.setElectricConsume(consumeElectric);
+
             BigDecimal electricCost = houseOrder.getElectricCost();
             if (ObjectUtils.isNotEmpty(electricCost)) {
                 costElectric = costElectric.add(electricCost);
@@ -1332,6 +1376,10 @@ public class HouseOrderController implements HouseOrderAPI {
             JSONObject jsonObjectWater = waterEquipmentService.roomCostRecord(waterEquipmentRoomId, live, leave);
             BigDecimal costWater = jsonObjectWater.getBigDecimal("cost");
             BigDecimal consumeWater = jsonObjectWater.getBigDecimal("consume");
+            houseOrderBill.setWaterCost(costWater);
+            houseOrderBill.setWaterConsume(consumeWater);
+
+
             BigDecimal waterCost = houseOrder.getWaterCost();
             if (ObjectUtils.isNotEmpty(waterCost)) {
                 costWater = costWater.add(waterCost);
@@ -1344,6 +1392,13 @@ public class HouseOrderController implements HouseOrderAPI {
             houseOrder.setWaterCost(costWater);
             houseOrder.setWaterConsume(consumeWater);
 
+            houseOrderBill.setHouseOrderId(houseOrder.getId());
+            houseOrderBill.setHouseNumberId(initialHouseNumberId);
+            houseOrderBill.setLiveTime(liveTime);
+            houseOrderBill.setLeaveTime(date);
+            houseOrderBillService.save(houseOrderBill);
+
+
         }
 
         houseOrderService.updateById(houseOrder);
@@ -2506,9 +2561,15 @@ public class HouseOrderController implements HouseOrderAPI {
                 String live = sdf.format(liveTime);
                 String leave = sdf.format(new Date());
 //                获取电的消费金额和额度
+                HouseOrderBill houseOrderBill = new HouseOrderBill();
+
                 JSONObject jsonObjectElectric = electricEquipmentService.roomCostRecord(electricEquipmentRoomId, live, leave);
                 BigDecimal costElectric = jsonObjectElectric.getBigDecimal("cost");
                 BigDecimal consumeElectric = jsonObjectElectric.getBigDecimal("consume");
+                houseOrderBill.setElectricCost(costElectric);
+                houseOrderBill.setElectricConsume(consumeElectric);
+
+
                 BigDecimal electricCost = houseOrder.getElectricCost();
                 if (ObjectUtils.isNotEmpty(electricCost)) {
                     costElectric = costElectric.add(electricCost);
@@ -2523,6 +2584,10 @@ public class HouseOrderController implements HouseOrderAPI {
                 JSONObject jsonObjectWater = waterEquipmentService.roomCostRecord(waterEquipmentRoomId, live, leave);
                 BigDecimal costWater = jsonObjectWater.getBigDecimal("cost");
                 BigDecimal consumeWater = jsonObjectWater.getBigDecimal("consume");
+                houseOrderBill.setWaterCost(costWater);
+                houseOrderBill.setWaterConsume(consumeWater);
+
+
                 BigDecimal waterCost = houseOrder.getWaterCost();
                 if (ObjectUtils.isNotEmpty(waterCost)) {
                     costWater = costWater.add(waterCost);
@@ -2534,6 +2599,14 @@ public class HouseOrderController implements HouseOrderAPI {
 
                 houseOrder.setWaterCost(costWater);
                 houseOrder.setWaterConsume(consumeWater);
+
+
+                houseOrderBill.setHouseOrderId(houseOrder.getId());
+                houseOrderBill.setHouseNumberId(houseNumberId);
+                houseOrderBill.setLiveTime(liveTime);
+                houseOrderBill.setLeaveTime(new Date());
+                houseOrderBillService.save(houseOrderBill);
+
             }
 
             LambdaQueryWrapper<Unlocking> wrapperU = new LambdaQueryWrapper<>();
@@ -2579,9 +2652,14 @@ public class HouseOrderController implements HouseOrderAPI {
             String live = sdf.format(liveTime);
             String leave = sdf.format(new Date());
 //                获取电的消费金额和额度
+            HouseOrderBill houseOrderBill = new HouseOrderBill();
             JSONObject jsonObjectElectric = electricEquipmentService.roomCostRecord(electricEquipmentRoomId, live, leave);
             BigDecimal costElectric = jsonObjectElectric.getBigDecimal("cost");
             BigDecimal consumeElectric = jsonObjectElectric.getBigDecimal("consume");
+            houseOrderBill.setElectricCost(costElectric);
+            houseOrderBill.setElectricConsume(consumeElectric);
+
+
             BigDecimal electricCost = houseOrder.getElectricCost();
             if (ObjectUtils.isNotEmpty(electricCost)) {
                 costElectric = costElectric.add(electricCost);
@@ -2596,6 +2674,9 @@ public class HouseOrderController implements HouseOrderAPI {
             JSONObject jsonObjectWater = waterEquipmentService.roomCostRecord(waterEquipmentRoomId, live, leave);
             BigDecimal costWater = jsonObjectWater.getBigDecimal("cost");
             BigDecimal consumeWater = jsonObjectWater.getBigDecimal("consume");
+            houseOrderBill.setWaterCost(costWater);
+            houseOrderBill.setWaterConsume(consumeWater);
+
             BigDecimal waterCost = houseOrder.getWaterCost();
             if (ObjectUtils.isNotEmpty(waterCost)) {
                 costWater = costWater.add(waterCost);
@@ -2608,6 +2689,13 @@ public class HouseOrderController implements HouseOrderAPI {
             houseOrder.setWaterCost(costWater);
             houseOrder.setWaterConsume(consumeWater);
 
+
+            houseOrderBill.setHouseOrderId(houseOrder.getId());
+            houseOrderBill.setHouseNumberId(houseNumberId);
+            houseOrderBill.setLiveTime(liveTime);
+            houseOrderBill.setLeaveTime(new Date());
+            houseOrderBillService.save(houseOrderBill);
+
         }
 
 
@@ -3587,9 +3675,15 @@ public class HouseOrderController implements HouseOrderAPI {
                         String live = sdf.format(liveTime);
                         String leave = sdf.format(new Date());
 //                获取电的消费金额和额度
+                        HouseOrderBill houseOrderBill = new HouseOrderBill();
+
                         JSONObject jsonObjectElectric = electricEquipmentService.roomCostRecord(electricEquipmentRoomId, live, leave);
                         BigDecimal costElectric = jsonObjectElectric.getBigDecimal("cost");
                         BigDecimal consumeElectric = jsonObjectElectric.getBigDecimal("consume");
+                        houseOrderBill.setElectricCost(costElectric);
+                        houseOrderBill.setElectricConsume(consumeElectric);
+
+
                         BigDecimal electricCost = houseOrder.getElectricCost();
                         if (ObjectUtils.isNotEmpty(electricCost)) {
                             costElectric = costElectric.add(electricCost);
@@ -3604,6 +3698,10 @@ public class HouseOrderController implements HouseOrderAPI {
                         JSONObject jsonObjectWater = waterEquipmentService.roomCostRecord(waterEquipmentRoomId, live, leave);
                         BigDecimal costWater = jsonObjectWater.getBigDecimal("cost");
                         BigDecimal consumeWater = jsonObjectWater.getBigDecimal("consume");
+                        houseOrderBill.setWaterCost(costWater);
+                        houseOrderBill.setWaterConsume(consumeWater);
+
+
                         BigDecimal waterCost = houseOrder.getWaterCost();
                         if (ObjectUtils.isNotEmpty(waterCost)) {
                             costWater = costWater.add(waterCost);
@@ -3615,6 +3713,14 @@ public class HouseOrderController implements HouseOrderAPI {
 
                         houseOrder.setWaterCost(costWater);
                         houseOrder.setWaterConsume(consumeWater);
+
+
+                        houseOrderBill.setHouseOrderId(houseOrder.getId());
+                        houseOrderBill.setHouseNumberId(houseNumberId);
+                        houseOrderBill.setLiveTime(liveTime);
+                        houseOrderBill.setLeaveTime(new Date());
+                        houseOrderBillService.save(houseOrderBill);
+
                     }
 
 //          将房间设置成脏房

src/main/java/com/template/controller/PasswordIssController.java

@@ -335,6 +335,8 @@ public class PasswordIssController {
 //    将密码加密
         String passWord = keyPassWordDto.getPassWord();
         String luid = keyPassWordDto.getEquipmentType();
+        System.out.println("密码passWord = " + passWord);
+        System.out.println("设备luid = " + luid);
         String encryptPassWord = AesUtils.encrypt(passWord, luid);
 
 

src/main/java/com/template/mapper/HouseOrderBillMapper.java

@@ -1,7 +1,7 @@
 package com.template.mapper;
 
-import com.template.model.pojo.HouseOrderBill;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.template.model.pojo.HouseOrderBill;
 import org.apache.ibatis.annotations.Mapper;
 
 /**

src/main/java/com/template/model/pojo/HouseOrderBill.java

@@ -21,7 +21,7 @@ import lombok.experimental.Accessors;
  * </p>
  *
  * @author ceshi
- * @since 2023-11-21
+ * @since 2024-11-08
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -32,53 +32,32 @@ public class HouseOrderBill implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value = "水电表")
-    @TableId(value = "id", type = IdType.UUID)
-    private Long id;
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
 
     @ApiModelProperty(value = "订单id")
-    private Long hotelOrderId;
+    private Integer houseOrderId;
 
     @ApiModelProperty(value = "房间id")
-    private Long houseNumberId;
+    private String houseNumberId;
 
-    @ApiModelProperty(value = "水起码 单位：吨")
-    private String startOfWater;
+    @ApiModelProperty(value = "电表消费总金额")
+    private BigDecimal electricCost;
 
-    @ApiModelProperty(value = "水止码")
-    private String endOfWater;
+    @ApiModelProperty(value = "电表消费总能耗")
+    private BigDecimal electricConsume;
 
-    @ApiModelProperty(value = "电起码 单位：度")
-    private String startOfElectric;
+    @ApiModelProperty(value = "水表消费总金额")
+    private BigDecimal waterCost;
 
-    @ApiModelProperty(value = "电止码")
-    private String endOfElectric;
+    @ApiModelProperty(value = "水表消费总能耗")
+    private BigDecimal waterConsume;
 
-    @ApiModelProperty(value = "水单价 单位：元/吨")
-    private String priceOfWater;
+    @ApiModelProperty(value = "入住时间")
+    private Date liveTime;
 
-    @ApiModelProperty(value = "电单价 单位：元/度")
-    private String priceOfElectric;
-
-    @ApiModelProperty(value = "总费用 单位：元")
-    private BigDecimal totalFree;
-
-    @ApiModelProperty(value = "减免费用 单位：元")
-    private BigDecimal discountFree;
-
-    @ApiModelProperty(value = "应缴费用 总费用-减免费用 单位：元")
-    private BigDecimal shouldFree;
-
-    @ApiModelProperty(value = "补缴费用 应缴费用-预缴费用")
-    private BigDecimal realFree;
-
-    @ApiModelProperty(value = "状态 1待处理、2已完成")
-    private String statu;
-
-    @ApiModelProperty(value = "完成时间")
-    private Date finishTime;
-
-    @ApiModelProperty(value = "备注")
-    private String remark;
+    @ApiModelProperty(value = "离店时间")
+    private Date leaveTime;
 
     @ApiModelProperty(value = "创建时间")
     @TableField(fill = FieldFill.INSERT)

src/main/java/com/template/services/HouseOrderBillService.java

@@ -1,7 +1,7 @@
 package com.template.services;
 
-import com.template.model.pojo.HouseOrderBill;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.template.model.pojo.HouseOrderBill;
 
 /**
  * <p>

src/main/java/com/template/services/impl/HouseOrderBillServiceImpl.java

@@ -1,7 +1,7 @@
 package com.template.services.impl;
 
-import com.template.model.pojo.HouseOrderBill;
 import com.template.mapper.HouseOrderBillMapper;
+import com.template.model.pojo.HouseOrderBill;
 import com.template.services.HouseOrderBillService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;