Merge branch 'main' of http://122.51.230.86:3000/dianliang/oil-station

fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/OilOrderServiceImpl.java

@@ -194,6 +194,7 @@ public class OilOrderServiceImpl extends ServiceImpl<OilOrderMapper, OilOrder> i
     @Resource
     OilNumberMapper oilNumberMapper;
     @Autowired
+    @Lazy
     private PayCenterService payCenterService;
 
     @Override

fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/mapper/xml/OilGunMapper.xml

@@ -158,16 +158,27 @@
     <select id="cashRegisterList" resultType="com.fuint.business.petrolStationManagement.vo.OilCashRegisterVo">
 
 
-        select zong.*, o2.oil_name
-        FROM (SELECT o1.*,
-                     o2.oil_name as oilNameId,
-                     o2.oil_type as oilType,
-                     o2.oil_price as oilPrice
-              FROM oil_gun o1
-             LEFT JOIN oil_number o2 ON o1.number_id = o2.number_id
-              WHERE o1.store_id = #{storeId} and o1.status = '启用' ) as zong
-                 LEFT JOIN oil_name as o2 on zong.oilNameId = o2.id
+        SELECT
+            o1.*,
+--  油罐id
+            o3.id  AS   oilTankId,
+--   油号 id
+            o2.oil_name AS oilNameId,
+            o2.oil_type AS oilType,
+            o2.oil_price AS oilPrice,
+            o3.tank_name
+        FROM
+            oil_gun o1
+-- 	 通过 油枪 找 油价
+                LEFT JOIN oil_number  o2 ON o1.number_id = o2.number_id
+-- 	 通过 油枪 找 油罐
+                LEFT JOIN oil_tank  o3 on o1.tank_id = o3.id
+-- 	 通过 油价 找 油号
+                LEFT JOIN oil_name o4 on  o4.id = o2.oil_name
 
+        WHERE
+            o1.store_id = #{storeId}
+          AND o1.STATUS = '启用'
 
     </select>
     <!--    &#45;&#45; and tank_id = #{oilGun.tankId}-->

fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/vo/OilCashRegisterVo.java

@@ -20,6 +20,8 @@ public class OilCashRegisterVo extends OilGun {
      *  关联表 挂牌价
      */
     private BigDecimal oilPrice;
+//     油号 id
     private Integer oilNameId;
-
+//      油罐id
+    private Integer oilTankId;
 }