10.24

fuintAdmin/src/views/oilConfig/oilTank/list.vue

@@ -6,12 +6,37 @@
         <el-form-item label="" prop="tankName">
           <el-input
             v-model="queryParams.tankName"
-            placeholder="油罐名称"
+            placeholder="请输入油罐名称"
             clearable
             style="width: 240px;"
             @keyup.enter.native="handleQuery"
           />
         </el-form-item>
+        <el-form-item label="" prop="oilNumber">
+          <el-select v-model="queryParams.oilNumber" placeholder="请选择油品油号" style="width:300px" @change="chooseOilNumber()" :disabled="disableInput">
+            <el-option
+              v-for="option in selectOilTypeByPrice"
+              :key="option.numberId"
+              :label="option.oilType +' '+option.oilName"
+              :value="option.oilType +' '+option.oilName"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="">
+          <el-date-picker
+            v-model="beginTime"
+            style="width: 160px"
+            type="date"
+            placeholder="开始日期">
+          </el-date-picker>
+          至
+          <el-date-picker
+            v-model="endTime"
+            style="width: 160px"
+            type="date"
+            placeholder="结束日期">
+          </el-date-picker>
+        </el-form-item>
 
         <el-form-item style="float: right;margin-right: 0px ">
           <el-button type="primary" icon="el-icon-search"  @click="handleQuery">搜索</el-button>
@@ -243,6 +268,8 @@ export default {
         page:null,
         pageSize:null
       },
+      beginTime: "",
+      endTime: "",
       unit: 'L',
       // 查询全部油品
       selectOilTypeByPrice: [],
@@ -298,6 +325,7 @@ export default {
   async created() {
     let this_ = this
     await this_.getList()
+    this.getOilNameList() // 查询全部油品
   },
   methods: {
     handleIsopenSelect() {
@@ -305,7 +333,12 @@ export default {
     },
     getList() {
       this.loading = true;
-      getTankApi(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
+      let dateRange = []
+      if (this.beginTime && this.endTime) {
+        dateRange.push(this.beginTime.toLocaleDateString())
+        dateRange.push(this.endTime.toLocaleDateString())
+      }
+      getTankApi(this.addDateRange(this.queryParams, dateRange)).then(response => {
         this.tankList = response.data.records;
         this.total = response.data.total;
       })
@@ -393,6 +426,8 @@ export default {
         page:null,
         pageSize:null
       };
+      this.beginTime = ''
+      this.endTime = ''
       this.getList();
     },
     // 新增油罐

fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/FyPayServiceImpl.java

@@ -234,7 +234,6 @@ public class FyPayServiceImpl implements FyPayService {
                         // 油品订单
                         oilOrder.setOrderStatus("paid");
                         oilOrder.setPayTime(date);
-                        oilOrderService.updateCardAndActiveById(oilOrder.getStoreId(), oilOrder.getUserId(), oilOrder.getId());
                         oilOrderService.insertFavorable(oilOrder, Double.valueOf(map1.get("oilCardAmount")));
                         // 修改油罐容量
                         oilOrderService.addOilTracks(oilOrder, oilOrder.getStoreId());
@@ -414,6 +413,9 @@ public class FyPayServiceImpl implements FyPayService {
                         allOrderInfo = allOrderInfoService.selectAllOrderInfoByOrderNo(orderNo);
                         // 添加提成记录信息
                         staffCommissionService.countStaffCommission(null,null, null, null, null, orderNo);
+
+                        // 消费有礼
+                        oilOrderService.updateCardAndActiveById(oilOrder.getStoreId(), oilOrder.getUserId(), oilOrder.getId());
                         //修改优惠券使用状态
                         //新表
                         CardCouponUser cardCouponUser = cardCouponUserMapper.selectOne(new LambdaQueryWrapper<CardCouponUser>()

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

@@ -656,9 +656,6 @@ public class OilOrderServiceImpl extends ServiceImpl<OilOrderMapper, OilOrder> i
             }
 
             baseMapper.insert(order);
-            if (order.getOrderStatus().equals("paid")) {
-                this.updateCardAndActiveById(storeId, userId, order.getId());
-            }
         }
 
         //        添加收银台订单信息
@@ -739,6 +736,9 @@ public class OilOrderServiceImpl extends ServiceImpl<OilOrderMapper, OilOrder> i
                 insertFavorable(oilOrder2, Double.valueOf(oilCardAmount));
             }
             cashierOrder.setOilOrderId(oilOrder2.getId());
+            if (oilOrder2.getOrderStatus().equals("paid")) {
+                this.updateCardAndActiveById(storeId, userId, oilOrder2.getId());
+            }
         }
         if (!ObjectUtil.isEmpty(goodsOrder1)) {
             orders.put("goodsOrder", goodsOrder1);

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

@@ -92,6 +92,12 @@
             <if test="oilTank.inventoryStatistics != null and oilTank.inventoryStatistics != ''">
                 and inventory_statistics = #{oilTank.inventoryStatistics}
             </if>
+            <if test="oilTank.params.beginTime != null and oilTank.params.beginTime != ''"><!-- 开始时间检索 -->
+                and date_format(update_time,'%y%m%d') &gt;= date_format(#{oilTank.params.beginTime},'%y%m%d')
+            </if>
+            <if test="oilTank.params.endTime != null and oilTank.params.endTime != ''"><!-- 结束时间检索 -->
+                and date_format(update_time,'%y%m%d') &lt;= date_format(#{oilTank.params.endTime},'%y%m%d')
+            </if>
         </where>
         ORDER BY update_time DESC
     </select>