bug修改

fuintAdmin_zt/src/api/payConfig/oilconfig.js

@@ -1,10 +1,11 @@
 import request from '@/utils/request'
 
 // 查询支付规则列表
-export function listOilConfig() {
+export function listOilConfig(query) {
   return request({
-    url: '/api/oilConfig/list',
+    url: '/api/oilConfig/listBystoreId',
     method: 'get',
+    params: query,
   })
 }
 

fuintAdmin_zt/src/views/Site/index.vue

@@ -217,11 +217,11 @@
 
                 <el-form-item v-if="pdinfo == 1">
                   <el-button type="primary" @click="submitForms('ruleForm')">新增</el-button>
-                  <el-button @click="resetForm('ruleForm')">重置</el-button>
+                  <!--<el-button @click="resetForm('ruleForm')">重置</el-button> -->
                 </el-form-item>
                 <el-form-item v-if="pdinfo == 2">
                   <el-button type="primary" @click="submitFormseide('ruleForm')">保存</el-button>
-                  <el-button @click="resetForm('ruleForm')">重置</el-button>
+                  <!--<el-button @click="resetForm('ruleForm')">重置</el-button> -->
                 </el-form-item>
               </el-form>
 
@@ -559,9 +559,21 @@
     created() {
       this.getList();
 
+
+
     },
     components: { Treeselect },
     methods: {
+
+      // 页面初始化
+      initPage() {
+       
+        this.activeName= 'list',
+        this.userList= 'list',
+        this.cleanUp()
+        this.getList()
+      },
+
       getswitch(e){
         console.log(e)
         if(e == true){
@@ -619,8 +631,7 @@
                   message: '操作成功',
                   type: 'success'
                 });
-                this.getList()
+                this.initPage()
-                this.cleanUp
               }
             })
           } else {
@@ -749,7 +760,7 @@
 
       },
       opendelete() {
-        this.$confirm('此操作将永久删除该文件, 是否继续?', '提示', {
+        this.$confirm('此操作将永久删除该机构, 是否继续?', '提示', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
           type: 'warning'
@@ -757,11 +768,11 @@
           deptDelete(this.deleteid).then(res=>{
             // console.log(res)
             if(res.code == 200){
+              this.initPage();
               this.$message({
                 type: 'success',
                 message: '删除成功!'
               });
-              this.getList()
               this.cleanUp
             }
           })

fuintAdmin_zt/src/views/components/Service/payment.vue

@@ -466,7 +466,7 @@ export default {
           }
         })
       })
-      listOilConfig().then( response => {
+      listOilConfig({storeId : this.id}).then( response => {
         this.oilConfigList = response.data;
       })
     },

fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/controller/OilConfigController.java

@@ -32,6 +32,11 @@ public class OilConfigController extends BaseController {
         return getSuccessResult(oilConfigService.selectOilConfigList());
     }
 
+    @GetMapping("/listBystoreId")
+    public ResponseObject listBystoreId(Integer storeId){
+        return getSuccessResult(oilConfigService.listBystoreId(storeId));
+    }
+
     /**
      * 查看支付配置规则是否开启
      * @param map

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

@@ -32,6 +32,8 @@ public interface OilConfigService extends IService<OilConfig> {
      */
     public List<OilConfigVo> selectOilConfigList();
 
+    public List<OilConfigVo> listBystoreId(Integer storeId);
+
     /**
      * 根据id查询支付配置信息
      * @param id

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

@@ -11,6 +11,7 @@ import com.fuint.api.fuyou.service.OilConfigService;
 import com.fuint.api.fuyou.vo.OilConfigVo;
 import com.fuint.common.dto.AccountInfo;
 import com.fuint.common.util.TokenUtil;
+import io.swagger.models.auth.In;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.config.ScheduledTaskRegistrar;
 import org.springframework.stereotype.Service;
@@ -103,6 +104,11 @@ public class OilConfigServiceImpl extends ServiceImpl<OilConfigMapper, OilConfig
         List<OilConfigVo> oilConfigs = baseMapper.selectOilConfigList(nowAccountInfo.getStoreId());
         return oilConfigs;
     }
+    @Override
+    public List<OilConfigVo> listBystoreId(Integer storeId) {
+        List<OilConfigVo> oilConfigs = baseMapper.selectOilConfigList(storeId);
+        return oilConfigs;
+    }
 
     @Override
     public OilConfigVo selectOilConfigById(int id) {

fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/controller/CardValueRecordController.java

@@ -7,6 +7,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fuint.business.marketingActivity.cardValue.dto.CardValueRecordDTO;
 import com.fuint.business.marketingActivity.cardValue.entity.CardValueRecord;
 import com.fuint.business.marketingActivity.cardValue.service.CardValueRecordService;
+import com.fuint.business.order.entity.LJOrder;
+import com.fuint.common.dto.AccountInfo;
+import com.fuint.common.util.TokenUtil;
 import com.fuint.framework.web.BaseController;
 import com.fuint.framework.web.ResponseObject;
 import org.apache.ibatis.annotations.Param;
@@ -43,6 +46,8 @@ public class CardValueRecordController extends BaseController {
     public ResponseObject selectAll(@RequestParam(value = "pageNo",defaultValue = "1") Integer pageNo,
                                     @RequestParam(value = "pageSize",defaultValue = "10") Integer pageSize,
                                     @Param("cardValueRecord") CardValueRecord cardValueRecord) {
+        AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
+        cardValueRecord.setStoreId(nowAccountInfo.getStoreId());
         Page page = new Page(pageNo, pageSize);
         return getSuccessResult(this.cardValueRecordService.page(page, new QueryWrapper<>(cardValueRecord)));
     }
@@ -175,5 +180,12 @@ public class CardValueRecordController extends BaseController {
     public void testCharge(@PathVariable String orderNo) {
        this.cardValueRecordService.rechargeFinallDeal(orderNo);
     }
+
+
+    // 订单统计
+    @GetMapping("/orderStatistics")
+    public ResponseObject orderStatistics( @Param("cardValueRecord") CardValueRecordDTO cardValueRecord){
+        return getSuccessResult(cardValueRecordService.orderStatistics(cardValueRecord));
+    }
 }
 

fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/mapper/CardValueRecordMapper.java

@@ -32,6 +32,7 @@ public interface CardValueRecordMapper extends BaseMapper<CardValueRecord> {
     List<Map<String, String>> prepaidCardSales(@Param("storeId")  Integer storeId);
     List<Map<String, String>> tunFuelCardSales(@Param("storeId")  Integer storeId);
 
+    Map<String, String> orderStatistics(@Param("cardValueRecord") CardValueRecordDTO cardValueRecord);
 
 
 }

fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/mapper/xml/CardValueRecordMapper.xml

@@ -215,6 +215,17 @@
         ORDER BY
             date_range.date
     </select>
+    <select id="orderStatistics" resultType="java.util.Map">
+        select count(*) numberOfTopUps, -- 充值笔数
+               sum(bid_balance) theTotalAmountOfTopUp, -- 充值总金额
+               sum(gift_balance) theTotalAmountOfTheCredit, -- 赠送总额
+               sum(recharge_balance) totalAmountReceived, -- 实收总额
+               COUNT(CASE WHEN payment_type = 'WECHAT' THEN 0 END) AS wechat, -- 微信
+               COUNT(CASE WHEN payment_type = 'ALIPAY' THEN 0 END) AS alipay, -- 支付宝
+               COUNT(CASE WHEN payment_type = 'CASH' THEN 0 END) AS cash -- 现金
+        from card_value_record
+        where store_id = #{cardValueRecord.storeId}
+    </select>
 </mapper>
 
 

fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/CardValueRecordService.java

@@ -7,6 +7,7 @@ import com.fuint.api.fuyou.entity.ReturnParameter;
 import com.fuint.business.integral.entity.IntegralDetail;
 import com.fuint.business.marketingActivity.cardValue.dto.CardValueRecordDTO;
 import com.fuint.business.marketingActivity.cardValue.entity.CardValueRecord;
+import com.fuint.business.order.entity.CashierOrder;
 import com.fuint.business.petrolStationManagement.entity.OilGun;
 import io.lettuce.core.dynamic.annotation.Param;
 
@@ -64,4 +65,7 @@ public interface CardValueRecordService extends IService<CardValueRecord> {
      * @return
      */
     CardValueRecord selectCardValueRecordByUserId();
+
+    Map<String, String> orderStatistics(CardValueRecordDTO cardValueRecord);
+
 }

fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/impl/CardValueRecordServiceImpl.java

@@ -39,6 +39,7 @@ import com.fuint.business.marketingActivity.cardValueOrders.entity.CardValueOrde
 import com.fuint.business.member.entity.LJStaff;
 import com.fuint.business.member.service.ILJStaffService;
 import com.fuint.business.order.entity.CardBalanceChange;
+import com.fuint.business.order.entity.CashierOrder;
 import com.fuint.business.order.service.CardBalanceChangeService;
 import com.fuint.business.userManager.entity.UserBalance;
 import com.fuint.business.userManager.mapper.LJUserMapper;
@@ -753,5 +754,24 @@ public class CardValueRecordServiceImpl extends ServiceImpl<CardValueRecordMappe
         queryWrapper.last("LIMIT 1");
         return baseMapper.selectOne(queryWrapper);
     }
+
+    @Override
+    public Map<String, String> orderStatistics(CardValueRecordDTO cardValueRecord) {
+
+//充值笔数
+//充值总金额
+//赠送总额
+//实收总额
+//微信
+//支付宝
+//现金
+
+        AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
+        Integer storeId = nowAccountInfo.getStoreId();
+        cardValueRecord.setStoreId(storeId);
+        Map<String, String> stringStringMap = baseMapper.orderStatistics(cardValueRecord);
+
+        return stringStringMap;
+    }
 }
 

fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/CashierOrderController.java

@@ -63,4 +63,16 @@ public class CashierOrderController extends BaseController {
         String orderNo = map.get("orderNo");
         return getSuccessResult(cashierOrderService.selectCashierOrder(orderNo));
     }
+
+
+
+    /**
+     * 收银台订单统计
+     * @param order
+     * @return
+     */
+    @GetMapping("/orderStatistics")
+    public ResponseObject orderStatistics(CashierOrder order){
+        return getSuccessResult(cashierOrderService.orderStatistics(order));
+    }
 }

fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/LJOrderController.java

@@ -3,6 +3,7 @@ package com.fuint.business.order.controller;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fuint.business.order.entity.LJOrder;
+import com.fuint.business.order.entity.OilOrder;
 import com.fuint.business.order.service.LJOrderService;
 import com.fuint.business.order.vo.LJOrderVo;
 import com.fuint.framework.web.BaseController;
@@ -91,4 +92,11 @@ public class LJOrderController extends BaseController {
         }
         return getSuccessResult(ljOrder);
     }
+
+
+    // 订单统计
+    @GetMapping("/orderStatistics")
+    public ResponseObject orderStatistics(LJOrder order){
+        return getSuccessResult(orderService.orderStatistics(order));
+    }
 }

fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/OilOrderController.java

@@ -2,6 +2,7 @@ package com.fuint.business.order.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fuint.business.order.entity.CashierOrder;
 import com.fuint.business.order.entity.LJOrder;
 import com.fuint.business.order.entity.OilOrder;
 import com.fuint.business.order.service.OilOrderService;
@@ -236,4 +237,10 @@ public class OilOrderController extends BaseController {
         return getSuccessResult(orderService.salesByOilProduct(type));
 
     }
+
+    // 订单统计
+    @GetMapping("/orderStatistics")
+    public ResponseObject orderStatistics(OilOrder order){
+        return getSuccessResult(orderService.orderStatistics(order));
+    }
 }

fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/CashierOrderMapper.java

@@ -9,6 +9,7 @@ import com.fuint.business.order.vo.Excel.CashierOrderExcel;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 
 public interface CashierOrderMapper extends BaseMapper<CashierOrder> {
@@ -29,4 +30,6 @@ public interface CashierOrderMapper extends BaseMapper<CashierOrder> {
      * @return
      */
     public CashierOrderVo selectCashierOrderById(@Param("id") int id);
+
+    Map<String, String> orderStatistics(@Param("order") CashierOrder order);
 }

fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/LJOrderMapper.java

@@ -31,4 +31,8 @@ public interface LJOrderMapper extends BaseMapper<LJOrder> {
     Map<String, String> goodsStream(@Param("storeId")  Integer storeId);
 
     List<Map<String, String>> merchandiseSales(@Param("storeId")  Integer storeId);
+
+    Map<String, String> orderStatistics(@Param("order") LJOrder order);
+
+
 }

fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/OilOrderMapper.java

@@ -100,4 +100,8 @@ public interface OilOrderMapper extends BaseMapper<OilOrder> {
      * @return
      */
     List<ActiveConsumptionVO> selectActiveConsumption(@Param("storeId") Integer storeId, @Param("amount")BigDecimal amount);
+
+
+    Map<String, String> orderStatistics( @Param("order") OilOrder order);
+
 }

fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/CashierOrderMapper.xml

@@ -75,5 +75,142 @@
         </where>
 
     </select>
+    <select id="orderStatistics" resultType="java.util.Map">
+        SELECT
+                (SELECT count(*) FROM cashier_order
+                <where>
+                    store_id = #{order.storeId}
+                    <if test="order.staffId != null and order.staffId != ''">
+                        and staff_id = #{order.staffId}
+                    </if>
+                    <if test="order.orderNo != null and order.orderNo != ''">
+                        and order_no like concat('%', #{order.orderNo}, '%')
+                    </if>
+                    <if test="order.terminal != null and order.terminal != ''">
+                        and terminal like concat('%', #{order.terminal}, '%')
+                    </if>
+                    <if test="order.params.beginTime != null and order.params.beginTime != ''">
+                        and date_format(pay_time,'%y%m%d') &gt;= date_format(#{order.params.beginTime},'%y%m%d')
+                    </if>
+                    <if test="order.params.endTime != null and order.params.endTime != ''">
+                        and date_format(pay_time,'%y%m%d') &lt;= date_format(#{order.params.endTime},'%y%m%d')
+                    </if>
+                </where>
+                    ) AS numberOfStrokes, -- 笔数
+                (SELECT sum(amount) FROM cashier_order
+                    <where>
+                        store_id = #{order.storeId}
+                        <if test="order.staffId != null and order.staffId != ''">
+                            and staff_id = #{order.staffId}
+                        </if>
+                        <if test="order.orderNo != null and order.orderNo != ''">
+                            and order_no like concat('%', #{order.orderNo}, '%')
+                        </if>
+                        <if test="order.terminal != null and order.terminal != ''">
+                            and terminal like concat('%', #{order.terminal}, '%')
+                        </if>
+                        <if test="order.params.beginTime != null and order.params.beginTime != ''">
+                            and date_format(pay_time,'%y%m%d') &gt;= date_format(#{order.params.beginTime},'%y%m%d')
+                        </if>
+                        <if test="order.params.endTime != null and order.params.endTime != ''">
+                            and date_format(pay_time,'%y%m%d') &lt;= date_format(#{order.params.endTime},'%y%m%d')
+                        </if>
+                    </where>
+                    ) AS theTotalAmountOfTheOrder, -- 订单总金额
+                (SELECT sum(pay_amount) FROM cashier_order
+                    <where>
+                        store_id = #{order.storeId}
+                        <if test="order.staffId != null and order.staffId != ''">
+                            and staff_id = #{order.staffId}
+                        </if>
+                        <if test="order.orderNo != null and order.orderNo != ''">
+                            and order_no like concat('%', #{order.orderNo}, '%')
+                        </if>
+                        <if test="order.terminal != null and order.terminal != ''">
+                            and terminal like concat('%', #{order.terminal}, '%')
+                        </if>
+                        <if test="order.params.beginTime != null and order.params.beginTime != ''">
+                            and date_format(pay_time,'%y%m%d') &gt;= date_format(#{order.params.beginTime},'%y%m%d')
+                        </if>
+                        <if test="order.params.endTime != null and order.params.endTime != ''">
+                            and date_format(pay_time,'%y%m%d') &lt;= date_format(#{order.params.endTime},'%y%m%d')
+                        </if>
+                    </where>
+                    ) AS theTotalAmountPaid, -- 实付总金额
+                (SELECT sum(oil_discount_amount) FROM cashier_order
+                    <where>
+                        store_id = #{order.storeId}
+                        <if test="order.staffId != null and order.staffId != ''">
+                            and staff_id = #{order.staffId}
+                        </if>
+                        <if test="order.orderNo != null and order.orderNo != ''">
+                            and order_no like concat('%', #{order.orderNo}, '%')
+                        </if>
+                        <if test="order.terminal != null and order.terminal != ''">
+                            and terminal like concat('%', #{order.terminal}, '%')
+                        </if>
+                        <if test="order.params.beginTime != null and order.params.beginTime != ''"><!-- 开始时间检索 -->
+                            and date_format(pay_time,'%y%m%d') &gt;= date_format(#{order.params.beginTime},'%y%m%d')
+                        </if>
+                        <if test="order.params.endTime != null and order.params.endTime != ''"><!-- 结束时间检索 -->
+                            and date_format(pay_time,'%y%m%d') &lt;= date_format(#{order.params.endTime},'%y%m%d')
+                        </if>
+                        order by pay_time desc
+                    </where>
+                    ) AS oilDiscounts, -- 油品优惠
+                (SELECT sum(oil_order_amount) FROM cashier_order
+                    <where>
+                        store_id = #{order.storeId}
+                        <if test="order.staffId != null and order.staffId != ''">
+                            and staff_id = #{order.staffId}
+                        </if>
+                        <if test="order.orderNo != null and order.orderNo != ''">
+                            and order_no like concat('%', #{order.orderNo}, '%')
+                        </if>
+                        <if test="order.terminal != null and order.terminal != ''">
+                            and terminal like concat('%', #{order.terminal}, '%')
+                        </if>
+                        <if test="order.params.beginTime != null and order.params.beginTime != ''"><!-- 开始时间检索 -->
+                            and date_format(pay_time,'%y%m%d') &gt;= date_format(#{order.params.beginTime},'%y%m%d')
+                        </if>
+                        <if test="order.params.endTime != null and order.params.endTime != ''"><!-- 结束时间检索 -->
+                            and date_format(pay_time,'%y%m%d') &lt;= date_format(#{order.params.endTime},'%y%m%d')
+                        </if>
+                        order by pay_time desc
+                    </where>
+                    ) AS theTotalAmountOfOil, -- 油品总金额
+                (SELECT sum(goods_order_amount) FROM cashier_order
+                    <where>
+                        store_id = #{order.storeId}
+                        <if test="order.staffId != null and order.staffId != ''">
+                            and staff_id = #{order.staffId}
+                        </if>
+                        <if test="order.orderNo != null and order.orderNo != ''">
+                            and order_no like concat('%', #{order.orderNo}, '%')
+                        </if>
+                        <if test="order.terminal != null and order.terminal != ''">
+                            and terminal like concat('%', #{order.terminal}, '%')
+                        </if>
+                        <if test="order.params.beginTime != null and order.params.beginTime != ''"><!-- 开始时间检索 -->
+                            and date_format(pay_time,'%y%m%d') &gt;= date_format(#{order.params.beginTime},'%y%m%d')
+                        </if>
+                        <if test="order.params.endTime != null and order.params.endTime != ''"><!-- 结束时间检索 -->
+                            and date_format(pay_time,'%y%m%d') &lt;= date_format(#{order.params.endTime},'%y%m%d')
+                        </if>
+                        order by pay_time desc
+                    </where>
+                    ) AS theTotalAmountOfTheItem -- 商品总金额
+
+    </select>
+<!--        <select id="orderStatistics" resultType="java.util.Map">-->
+<!--            SELECT-->
+<!--                    (SELECT count(*) FROM cashier_order) AS 笔数,-->
+<!--                    (SELECT sum(amount) FROM cashier_order) AS 订单总金额,-->
+<!--                    (SELECT sum(pay_amount) FROM cashier_order) AS 实付总金额,-->
+<!--                    (SELECT sum(oil_discount_amount) FROM cashier_order) AS 油品优惠,-->
+<!--                    (SELECT sum(oil_order_amount) FROM cashier_order) AS 油品总金额,-->
+<!--                    (SELECT sum(goods_order_amount) FROM cashier_order) AS 商品总金额-->
+
+<!--        </select>-->
 
 </mapper>

fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/LJOrderMapper.xml

@@ -153,6 +153,38 @@
         ORDER BY
             date_range.date;
     </select>
+    <select id="orderStatistics" resultType="java.util.Map">
+
+        select count(*) numberOfProducts, -- 商品笔数
+               sum(pay_amount) theTotalAmount, -- 总金额
+               sum(goods_num) theTotalNumberOfUnits, -- 商品总数量
+               sum(discount) discountAmount, -- 优惠金额
+               COUNT(CASE WHEN pay_type = 'WECHAT' THEN 0 END) AS wechat, -- 微信
+               COUNT(CASE WHEN pay_type = 'ALIPAY' THEN 0 END) AS alipay, -- 支付宝
+               COUNT(CASE WHEN pay_type = 'CASH' THEN 0 END) AS cash -- 现金
+        from mt_order
+        <where>
+            store_id = #{order.storeId}
+            <if test="order.staffId != null and order.staffId != ''">
+                and staff_id = #{order.staffId}
+            </if>
+            <if test="order.payType != null and order.payType != ''">
+                and pay_type = #{order.payType}
+            </if>
+            <if test="order.orderNo != null and order.orderNo != ''">
+                and order_no like concat('%', #{order.orderNo}, '%')
+            </if>
+            <if test="order.payUser != null and order.payUser != ''">
+                and pay_user like concat('%', #{order.payUser}, '%')
+            </if>
+            <if test="order.params.beginTime != null and order.params.beginTime != ''"><!-- 开始时间检索 -->
+                and date_format(create_time,'%y%m%d') &gt;= date_format(#{order.params.beginTime},'%y%m%d')
+            </if>
+            <if test="order.params.endTime != null and order.params.endTime != ''"><!-- 结束时间检索 -->
+                and date_format(create_time,'%y%m%d') &lt;= date_format(#{order.params.endTime},'%y%m%d')
+            </if>
+        </where>
+    </select>
 </mapper>
 
 

fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/OilOrderMapper.xml

@@ -387,5 +387,49 @@
         where ac.store_id = #{storeId}
           and ac.participation_condition_money <= #{amount}
     </select>
+    <select id="orderStatistics" resultType="java.util.Map">
+        select count(*) numberOfOilPens,
+               sum(order_amount) theTotalAmountOfOil,
+               sum(discount_amount) theTotalAmountOfTheOffer,
+               sum(oil_num) numberOfTransactions,
+               sum(pay_amount) totalAmountReceived,
+               COUNT(CASE WHEN pay_type = 'WECHAT' THEN 0 END) AS wechat,
+               COUNT(CASE WHEN pay_type = 'ALIPAY' THEN 0 END) AS alipay,
+               COUNT(CASE WHEN pay_type = 'CASH' THEN 0 END) AS cash
+        from oil_order
+        <where>
+            store_id = #{order.storeId}
+            <if test="order.userId != null and order.userId != ''">
+                and user_id = #{order.userId}
+            </if>
+            <if test="order.staffId != null and order.staffId != ''">
+                and staff_id = #{order.staffId}
+            </if>
+            <if test="order.terminal != null and order.terminal != ''">
+                and terminal = #{order.terminal}
+            </if>
+            <if test="order.oilGunNum != null and order.oilGunNum != ''">
+                and oil_gun_num = #{order.oilGunNum}
+            </if>
+            <if test="order.payType != null and order.payType != ''">
+                and pay_type = #{order.payType}
+            </if>
+            <if test="order.orderStatus != null and order.orderStatus != ''">
+                and order_status != #{order.orderStatus}
+            </if>
+            <if test="order.orderNo != null and order.orderNo != ''">
+                and order_no like concat('%', #{order.orderNo}, '%')
+            </if>
+            <if test="order.payUser != null and order.payUser != ''">
+                and pay_user like concat('%', #{order.payUser}, '%')
+            </if>
+            <if test="order.params.beginTime != null and order.params.beginTime != ''"><!-- 开始时间检索 -->
+                and date_format(pay_time,'%y%m%d') &gt;= date_format(#{order.params.beginTime},'%y%m%d')
+            </if>
+            <if test="order.params.endTime != null and order.params.endTime != ''"><!-- 结束时间检索 -->
+                and date_format(pay_time,'%y%m%d') &lt;= date_format(#{order.params.endTime},'%y%m%d')
+            </if>
+        </where>
+    </select>
 
 </mapper>

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

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.fuint.business.order.entity.CashierOrder;
 
 import javax.servlet.http.HttpServletResponse;
+import java.util.Map;
 
 /**
  * 收银员订单信息 业务层
@@ -48,4 +49,6 @@ public interface CashierOrderService extends IService<CashierOrder> {
      * @return
      */
     public int updateCashierOrder(CashierOrder order);
+
+    Map<String, String> orderStatistics(CashierOrder order);
 }

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

@@ -7,6 +7,7 @@ import com.fuint.business.order.entity.LJOrder;
 import com.fuint.business.order.vo.LJOrderVo;
 
 import javax.servlet.http.HttpServletResponse;
+import java.util.Map;
 
 /**
  * 订单信息 业务层
@@ -53,4 +54,6 @@ public interface LJOrderService extends IService<LJOrder> {
      * @return
      */
     public int updateGoodOrder(LJOrder order);
+
+    Map<String, String> orderStatistics(LJOrder order);
 }

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

@@ -131,6 +131,11 @@ public interface OilOrderService extends IService<OilOrder> {
     List<Map<String, String>> oilSales();
     List<List<Object>> salesByOilProduct(String type);
 
+    /**
+     * 流水订单统计
+     * @return
+     */
+    Map<String, String> orderStatistics(OilOrder order);
 
 
 

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

@@ -18,6 +18,7 @@ import org.springframework.stereotype.Service;
 
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
+import java.util.Map;
 
 @Service
 public class CashierOrderServiceImpl extends ServiceImpl<CashierOrderMapper, CashierOrder> implements CashierOrderService {
@@ -81,4 +82,21 @@ public class CashierOrderServiceImpl extends ServiceImpl<CashierOrderMapper, Cas
         int row = baseMapper.updateById(order);
         return row;
     }
+
+    @Override
+    public Map<String, String> orderStatistics(CashierOrder order) {
+
+//订单笔数
+//订单总金额
+//优惠总数/升数
+//实收总额/升数
+//油品总金额
+//商品总金额
+        AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
+        Integer storeId = nowAccountInfo.getStoreId();
+        order.setStoreId(storeId);
+        Map<String, String> stringStringMap = baseMapper.orderStatistics(order);
+
+        return stringStringMap;
+    }
 }

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

@@ -5,22 +5,18 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.fuint.business.convenienceSore.entity.StockStatistic;
-import com.fuint.business.convenienceSore.entity.StockTrack;
-import com.fuint.business.convenienceSore.service.StockStatisticService;
-import com.fuint.business.convenienceSore.service.StockTrackService;
 import com.fuint.business.order.entity.LJOrder;
 import com.fuint.business.order.mapper.LJOrderMapper;
 import com.fuint.business.order.service.LJOrderService;
 import com.fuint.business.order.vo.Excel.LJOrderExcel;
 import com.fuint.business.order.vo.LJOrderVo;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
 import com.fuint.common.dto.AccountInfo;
 import com.fuint.common.util.TokenUtil;
+import org.springframework.stereotype.Service;
 
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
+import java.util.Map;
 
 @Service
 public class LJOrderServiceImpl extends ServiceImpl<LJOrderMapper, LJOrder> implements LJOrderService {
@@ -93,4 +89,18 @@ public class LJOrderServiceImpl extends ServiceImpl<LJOrderMapper, LJOrder> impl
         int row = baseMapper.updateById(order);
         return row;
     }
+
+    @Override
+    public Map<String, String> orderStatistics(LJOrder order) {
+        //商品笔数
+        //总金额
+        //商品总数量
+        //优惠金额
+        //微信
+        //支付宝
+        //现金
+        AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
+        order.setStoreId(nowAccountInfo.getStoreId());
+        return baseMapper.orderStatistics(order);
+    }
 }

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

@@ -1140,4 +1140,25 @@ public class OilOrderServiceImpl extends ServiceImpl<OilOrderMapper, OilOrder> i
         DecimalFormat decimalFormat = new DecimalFormat("#.##");
         return Double.valueOf(decimalFormat.format(growthRate));
     }
+
+
+
+
+
+    @Override
+    public Map<String, String> orderStatistics(OilOrder order) {
+//油品笔数
+//油品总金额
+//优惠总额
+//交易数量
+//实收总额
+//微信
+//支付宝
+//现金
+        AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
+        Integer storeId = nowAccountInfo.getStoreId();
+        order.setStoreId(storeId);
+
+        return oilOrderMapper.orderStatistics(order);
+    }
 }

fuintBackend/fuint-application/src/main/java/com/fuint/business/store/mapper/MtStoreMapper.java

@@ -36,8 +36,10 @@ public interface MtStoreMapper extends BaseMapper<MtStore> {
     int editStatusBydeptIdList(@Param("list") List<SysDept> sysDeptsByjy);
 
     // 批量修改该状态根据部门
-    int editStatusBydeptId(Long deptId);
+    int editStatusBydeptId(@Param("deptId") Long deptId);
 
     int editStatusByExpirationTime();
 
+    int ifDeleteByDeptId(@Param("deptId") Long deptId);
+
 }

fuintBackend/fuint-application/src/main/java/com/fuint/business/store/mapper/xml/ExportExcelService.xml

@@ -40,7 +40,7 @@
     </update>
     <update id="editStatusBydeptId">
         update mt_store
-        status = 'jy'
+        set status = 'jy'
         <where>
             contract_dept_id =
                 #{deptId}
@@ -49,7 +49,7 @@
     </update>
     <update id="editStatusBydeptIdList">
         update mt_store
-            status = 'jy'
+         set   status = 'jy'
         <where>
             contract_dept_id IN
             <foreach collection="list" item="list" separator="," open="(" close=")">
@@ -59,8 +59,13 @@
     </update>
     <update id="editStatusByExpirationTime">
         update mt_store
-            status = 'jy'
+          set  status = 'jy'
             where expiration_time > NOW() and  status = 'qy'
     </update>
+    <update id="ifDeleteByDeptId" parameterType="java.lang.Long">
+        update mt_store
+        set if_delete = '1'
+        where contract_dept_id = #{deptId}
+    </update>
 
 </mapper>

fuintBackend/fuint-application/src/main/java/com/fuint/business/store/service/StoreService.java

@@ -109,4 +109,8 @@ public interface StoreService extends IService<MtStore> {
 
     void flowflowConfiguration();
     void petrolStationsAreExpired();
+
+    // 假删除店铺
+
+    boolean ifDeleteByDeptId(Long deptId);
 }

fuintBackend/fuint-application/src/main/java/com/fuint/business/store/service/impl/StoreServiceImpl.java

@@ -2,10 +2,12 @@ package com.fuint.business.store.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.fuint.business.order.entity.AllOrderInfo;
 import com.fuint.business.order.mapper.AllOrderInfoMapper;
+import com.fuint.business.store.entity.MtStore;
+import com.fuint.business.store.mapper.MtStoreMapper;
 import com.fuint.business.store.service.StoreService;
 import com.fuint.common.dto.AccountInfo;
 import com.fuint.common.dto.StoreDto;
@@ -15,16 +17,13 @@ import com.fuint.common.service.MerchantService;
 import com.fuint.common.util.TokenUtil;
 import com.fuint.framework.annoation.OperationServiceLog;
 import com.fuint.framework.exception.BusinessCheckException;
-import com.fuint.framework.exception.GlobalExceptionHandler;
 import com.fuint.framework.pagination.PaginationRequest;
 import com.fuint.framework.pagination.PaginationResponse;
 import com.fuint.module.backendApi.response.LoginResponse;
 import com.fuint.repository.bean.StoreDistanceBean;
 import com.fuint.repository.mapper.MtMerchantMapper;
-import com.fuint.business.store.mapper.MtStoreMapper;
 import com.fuint.repository.mapper.TAccountMapper;
 import com.fuint.repository.model.MtMerchant;
-import com.fuint.business.store.entity.MtStore;
 import com.fuint.repository.model.TAccount;
 import com.fuint.system.dept.entity.SysDept;
 import com.fuint.system.dept.mapper.SysDeptMapper;
@@ -44,10 +43,10 @@ import org.springframework.data.domain.PageRequest;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+
 import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.util.*;
-import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
 
 /**
@@ -362,7 +361,7 @@ public class StoreServiceImpl extends ServiceImpl<MtStoreMapper, MtStore> implem
 
     @Autowired
     public RedisTemplate redisTemplate;
-    @Autowired
+    @Resource
     TAccountMapper tAccountMapper;
 
     @Resource
@@ -547,4 +546,16 @@ public class StoreServiceImpl extends ServiceImpl<MtStoreMapper, MtStore> implem
 
     }
 
+    @Override
+    public boolean ifDeleteByDeptId(Long deptId) {
+
+
+        // 创建 UpdateWrapper，用于更新 if_delete 列
+        UpdateWrapper<MtStore> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.set("if_delete", "1");
+        updateWrapper.eq("contract_dept_id",deptId);
+        // 使用 MyBatis-Plus 提供的 update 方法更新
+        int affectedRows = mtStoreMapper.update(null, updateWrapper);
+        return affectedRows>0;
+    }
 }

fuintBackend/fuint-application/src/main/java/com/fuint/system/dept/controller/SysDeptController.java

@@ -1,6 +1,7 @@
 package com.fuint.system.dept.controller;
 
 
+import com.fuint.business.store.service.StoreService;
 import com.fuint.business.storeInformation.entity.QRCode;
 import com.fuint.business.storeInformation.service.IQRCodeService;
 import com.fuint.common.constant.UserConstants;
@@ -17,6 +18,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
 import java.util.List;
 
 /**
@@ -102,6 +104,8 @@ public class SysDeptController extends BaseController
         return getSuccessResult(deptService.updateDept(dept));
     }
 
+    @Resource
+    StoreService storeService;
     /**
      * 删除部门
      */
@@ -116,6 +120,8 @@ public class SysDeptController extends BaseController
         {
             return getFailureResult("部门存在用户,不允许删除");
         }
+        // 删除store表的dept
+        storeService.ifDeleteByDeptId(deptId);
         return getSuccessResult(deptService.deleteDeptById(deptId));
     }
 

fuintBackend/fuint-application/src/main/java/com/fuint/system/dept/mapper/xml/SysDeptMapper.xml

@@ -70,7 +70,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	<select id="checkDeptNameUnique" resultType="com.fuint.system.dept.entity.SysDept">
 	   	select *
 		from sys_dept
-		where dept_name=#{deptName} and parent_id = #{parentId}  limit 1
+		where dept_name=#{deptName} and parent_id = #{parentId} and if_delete != 1  limit 1
 	</select>
 
 

fuintCashierWeb/src/api/cashier/cardvaluerecord.js

@@ -8,6 +8,14 @@ export function listCardValueRecord(cardValueRecord) {
     params: cardValueRecord
   })
 }
+// 查询会员充值统计
+export function orderStatisticsApi(cardValueRecord) {
+  return request({
+    url: '/business/marketingActivity/cardValueRecord/orderStatistics',
+    method: 'get',
+    params: cardValueRecord
+  })
+}
 
 // 查询挂账信息列表
 export function cardValueRecordInfo(id) {

fuintCashierWeb/src/api/cashier/cashierorder.js

@@ -25,3 +25,11 @@ export function cashierOrderByOrderNo(data) {
     data: data
   })
 }
+// 根据订单号查询油品订单信息
+export function orderStatisticsApi(query) {
+  return request({
+    url: '/business/cashierOrder/orderStatistics',
+    method: 'get',
+    params: query
+  })
+}

fuintCashierWeb/src/api/cashier/goodsorder.js

@@ -8,6 +8,14 @@ export function listOrder(query) {
     params: query
   })
 }
+// 查询商品订单统计
+export function orderStatisticsApi(query) {
+  return request({
+    url: '/business/order/orderStatistics',
+    method: 'get',
+    params: query
+  })
+}
 
 // 根据订单id查询商品订单信息
 export function getOrderGoods(data) {

fuintCashierWeb/src/api/cashier/oilorder.js

@@ -7,6 +7,13 @@ export function listOilOrder(query) {
     method: 'get',
     params: query
   })
+}// 订单统计
+export function orderStatisticsApi(query) {
+  return request({
+    url: '/business/oilOrder/orderStatistics',
+    method: 'get',
+    params: query
+  })
 }
 
 // 根据id查询油品订单信息

fuintCashierWeb/src/views/cashier/orderComponents/order_Cashier.vue

@@ -53,9 +53,29 @@
         <span>收银台订单统计</span>
       </div>
       <div class="box-gang">
-        <div class="box" v-for="(item,index) in 7" :key="index">
+        <div class="box">
-          <div class="size-hui">订单总数</div>
+          <div class="size-hui">笔数</div>
-          <div class="size-bole">55</div>
+          <div class="size-bole">{{ orderStatistics.numberOfStrokes?orderStatistics.numberOfStrokes:0 }}</div>
+        </div>
+        <div class="box">
+          <div class="size-hui">订单总金额</div>
+          <div class="size-bole">{{ orderStatistics.theTotalAmountOfTheOrder?orderStatistics.theTotalAmountOfTheOrder:0 }}</div>
+        </div>
+        <div class="box">
+          <div class="size-hui">实付总金额</div>
+          <div class="size-bole">{{ orderStatistics.theTotalAmountPaid?orderStatistics.theTotalAmountPaid:0 }}</div>
+        </div>
+        <div class="box">
+          <div class="size-hui">油品优惠</div>
+          <div class="size-bole">{{ orderStatistics.oilDiscounts?orderStatistics.oilDiscounts:0 }}</div>
+        </div>
+        <div class="box">
+          <div class="size-hui">油品总金额</div>
+          <div class="size-bole">{{ orderStatistics.theTotalAmountOfOil?orderStatistics.theTotalAmountOfOil:0 }}</div>
+        </div>
+        <div class="box">
+          <div class="size-hui">商品总金额</div>
+          <div class="size-bole">{{ orderStatistics.theTotalAmountOfTheItem?orderStatistics.theTotalAmountOfTheItem:0 }}</div>
         </div>
 
       </div>
@@ -258,7 +278,7 @@
 </template>
 
 <script>
-import {cashierOrder, listCashierOrder} from "@/api/cashier/cashierorder";
+import {cashierOrder, listCashierOrder,orderStatisticsApi} from "@/api/cashier/cashierorder";
   import {queryStaffs} from "@/api/cashier/staff";
 import {oilOrderList, oilOrders} from "@/api/cashier/oilorder";
 import {getOilNameList} from "@/api/cashier/oilnumgun";
@@ -292,68 +312,30 @@ import {getOrderGoods} from "@/api/cashier/goodsorder";
           page: 1,
           pageSize: 10,
         },
+        orderStatistics:{
+          numberOfStrokes:'0',
+          theTotalAmountOfTheOrder:'0',
+          theTotalAmountPaid:'0',
+          oilDiscounts:'0',
+          theTotalAmountOfOil:'0',
+          theTotalAmountOfTheItem:'0',
+        },
         total:0,
-      //   labelPosition: 'right',
-      //   formLabelAlign: {
-      //     name: '',
-      //   },
-      //   tableData: [{
-      //     date: '2016-05-03',
-      //     name: '王小狼',
-      //     province: '上海',
-      //     city: '普陀区',
-      //     address: '上海市普陀区金沙江路 1518 弄',
-      //     zip: 200333
-      //   }, {
-      //     date: '2016-05-02',
-      //     name: '王小虎',
-      //     province: '上海',
-      //     city: '普陀区',
-      //     address: '上海市普陀区金沙江路 1518 弄',
-      //     zip: 200333
-      //   }, {
-      //     date: '2016-05-04',
-      //     name: '王小虎',
-      //     province: '上海',
-      //     city: '普陀区',
-      //     address: '上海市普陀区金沙江路 1518 弄',
-      //     zip: 200333
-      //   }, {
-      //     date: '2016-05-01',
-      //     name: '王小虎',
-      //     province: '上海',
-      //     city: '普陀区',
-      //     address: '上海市普陀区金沙江路 1518 弄',
-      //     zip: 200333
-      //   }, {
-      //     date: '2016-05-08',
-      //     name: '王小虎',
-      //     province: '上海',
-      //     city: '普陀区',
-      //     address: '上海市普陀区金沙江路 1518 弄',
-      //     zip: 200333
-      //   }, {
-      //     date: '2016-05-06',
-      //     name: '王小虎',
-      //     province: '上海',
-      //     city: '普陀区',
-      //     address: '上海市普陀区金沙江路 1518 弄',
-      //     zip: 200333
-      //   }, {
-      //     date: '2016-05-07',
-      //     name: '王小虎',
-      //     province: '上海',
-      //     city: '普陀区',
-      //     address: '上海市普陀区金沙江路 1518 弄',
-      //     zip: 200333
-      //   }]
       }
     },
     created() {
       this.getList();
+      this.getOrderStatistics();
       this.getStaffList();
     },
     methods:{
+      // 获取订单统计信息
+
+      getOrderStatistics() {
+        orderStatisticsApi(this.addDateRange(this.queryParams, this.dateRange)).then(res=>{
+          this.orderStatistics = res.data
+        })
+      },
       // 获取员工姓名
       getRealName(list,val){
         let name = "";

fuintCashierWeb/src/views/cashier/orderComponents/order_Goods.vue

@@ -81,10 +81,35 @@
         <span>商品交易统计</span>
       </div>
       <div class="box-gang">
-        <div class="box" v-for="(item,index) in 7" :key="index">
+        <div class="box">
-          <div class="size-hui">订单总数</div>
+          <div class="size-hui">商品笔数</div>
-          <div class="size-bole">55</div>
+          <div class="size-bole">{{orderStatistics.numberOfProducts}}</div>
         </div>
+        <div class="box">
+          <div class="size-hui">总金额</div>
+          <div class="size-bole">{{orderStatistics.theTotalAmount}}</div>
+        </div>
+        <div class="box">
+          <div class="size-hui">商品总数量</div>
+          <div class="size-bole">{{orderStatistics.theTotalNumberOfUnits}}</div>
+        </div>
+        <div class="box">
+          <div class="size-hui">优惠金额</div>
+          <div class="size-bole">{{orderStatistics.discountAmount}}</div>
+        </div>
+        <div class="box">
+          <div class="size-hui">微信</div>
+          <div class="size-bole">{{orderStatistics.wechat}}</div>
+        </div>
+        <div class="box">
+          <div class="size-hui">支付宝</div>
+          <div class="size-bole">{{orderStatistics.alipay}}</div>
+        </div>
+        <div class="box">
+          <div class="size-hui">现金</div>
+          <div class="size-bole">{{orderStatistics.cash}}</div>
+        </div>
+
 
       </div>
     </el-card>
@@ -185,7 +210,7 @@
 </template>
 
 <script>
-import {getOrderGoods, listOrder} from "@/api/cashier/goodsorder";
+import {getOrderGoods, listOrder,orderStatisticsApi} from "@/api/cashier/goodsorder";
 import {queryStaffs} from "@/api/cashier/staff";
 import {getDicts} from "@/api/dict/data";
 
@@ -224,64 +249,30 @@ export default {
       // 支付列表
       payList:[],
 
-      // tableData: [{
+      orderStatistics: {
-      //   date: '2016-05-03',
+        numberOfProducts:'0',
-      //   name: '王小狼',
+        theTotalAmount:'0',
-      //   province: '上海',
+        theTotalNumberOfUnits:'0',
-      //   city: '普陀区',
+        discountAmount:'0',
-      //   address: '上海市普陀区金沙江路 1518 弄',
+        wechat:'0',
-      //   zip: 200333
+        alipay:'0',
-      // }, {
+        cash:'0',
-      //   date: '2016-05-02',
+      },
-      //   name: '王小虎',
-      //   province: '上海',
-      //   city: '普陀区',
-      //   address: '上海市普陀区金沙江路 1518 弄',
-      //   zip: 200333
-      // }, {
-      //   date: '2016-05-04',
-      //   name: '王小虎',
-      //   province: '上海',
-      //   city: '普陀区',
-      //   address: '上海市普陀区金沙江路 1518 弄',
-      //   zip: 200333
-      // }, {
-      //   date: '2016-05-01',
-      //   name: '王小虎',
-      //   province: '上海',
-      //   city: '普陀区',
-      //   address: '上海市普陀区金沙江路 1518 弄',
-      //   zip: 200333
-      // }, {
-      //   date: '2016-05-08',
-      //   name: '王小虎',
-      //   province: '上海',
-      //   city: '普陀区',
-      //   address: '上海市普陀区金沙江路 1518 弄',
-      //   zip: 200333
-      // }, {
-      //   date: '2016-05-06',
-      //   name: '王小虎',
-      //   province: '上海',
-      //   city: '普陀区',
-      //   address: '上海市普陀区金沙江路 1518 弄',
-      //   zip: 200333
-      // }, {
-      //   date: '2016-05-07',
-      //   name: '王小虎',
-      //   province: '上海',
-      //   city: '普陀区',
-      //   address: '上海市普陀区金沙江路 1518 弄',
-      //   zip: 200333
-      // }]
     }
   },
   created() {
     this.getList();
+    this.getOrderStatistics();
     this.getStaffList();
     this.getPayList();
   },
   methods:{
+    // 订单统计
+    getOrderStatistics (){
+      orderStatisticsApi(this.addDateRange(this.queryParams, this.dateRange)).then(res=>{
+        this.orderStatistics = res.data;
+      })
+    },
     // 根据员工id查询员工信息
     queryStaf(list,id){
       let name = "";
@@ -365,6 +356,7 @@ export default {
     handleQuery() {
       this.queryParams.page = 1;
       this.getList();
+      this.getOrderStatistics();
     },
     // 重置按钮操作
     resetQuery() {

fuintCashierWeb/src/views/cashier/orderComponents/order_Oil.vue

@@ -94,10 +94,39 @@
         <span>油品订单统计</span>
       </div>
       <div class="box-gang">
-        <div class="box" v-for="(item,index) in 7" :key="index">
+        <div class="box">
-          <div class="size-hui">订单总数</div>
+          <div class="size-hui">油品笔数</div>
-          <div class="size-bole">55</div>
+          <div class="size-bole">{{orderStatistics.numberOfOilPens}}</div>
         </div>
+        <div class="box">
+          <div class="size-hui">油品总金额</div>
+          <div class="size-bole">{{orderStatistics.theTotalAmountOfOil}}</div>
+        </div>
+        <div class="box">
+          <div class="size-hui">优惠总额</div>
+          <div class="size-bole">{{orderStatistics.theTotalAmountOfTheOffer}}</div>
+        </div>
+        <div class="box">
+          <div class="size-hui">交易数量</div>
+          <div class="size-bole">{{orderStatistics.numberOfTransactions}}</div>
+        </div>
+        <div class="box">
+          <div class="size-hui">实收总额</div>
+          <div class="size-bole">{{orderStatistics.totalAmountReceived}}</div>
+        </div>
+        <div class="box">
+          <div class="size-hui">微信</div>
+          <div class="size-bole">{{orderStatistics.wechat}}</div>
+        </div>
+        <div class="box">
+          <div class="size-hui">支付宝</div>
+          <div class="size-bole">{{orderStatistics.alipay}}</div>
+        </div>
+        <div class="box">
+          <div class="size-hui">现金</div>
+          <div class="size-bole">{{orderStatistics.cash}}</div>
+        </div>
+
 
       </div>
     </el-card>
@@ -258,7 +287,7 @@
   import {queryStaffs} from "@/api/cashier/staff";
   import {getDicts} from "@/api/dict/data";
   import {getOilNameList, getOilNumGun } from "@/api/cashier/oilnumgun";
-  import {listOilOrder, oilOrderInfo} from "@/api/cashier/oilorder";
+  import {listOilOrder, oilOrderInfo, orderStatisticsApi} from "@/api/cashier/oilorder";
   import {getUser} from "@/api/cashier/user/user";
 
   export default {
@@ -291,63 +320,30 @@
         },
         total:0,
 
-        // tableData: [{
+        orderStatistics: {
-        //   date: '2016-05-03',
+          numberOfOilPens:'0',
-        //   name: '王小狼',
+          theTotalAmountOfOil:'0',
-        //   province: '上海',
+          theTotalAmountOfTheOffer:'0',
-        //   city: '普陀区',
+          numberOfTransactions:'0',
-        //   address: '上海市普陀区金沙江路 1518 弄',
+          totalAmountReceived:'0',
-        //   zip: 200333
+          wechat:'0',
-        // }, {
+          alipay:'0',
-        //   date: '2016-05-02',
+          cash:'0',
-        //   name: '王小虎',
+        }
-        //   province: '上海',
-        //   city: '普陀区',
-        //   address: '上海市普陀区金沙江路 1518 弄',
-        //   zip: 200333
-        // }, {
-        //   date: '2016-05-04',
-        //   name: '王小虎',
-        //   province: '上海',
-        //   city: '普陀区',
-        //   address: '上海市普陀区金沙江路 1518 弄',
-        //   zip: 200333
-        // }, {
-        //   date: '2016-05-01',
-        //   name: '王小虎',
-        //   province: '上海',
-        //   city: '普陀区',
-        //   address: '上海市普陀区金沙江路 1518 弄',
-        //   zip: 200333
-        // }, {
-        //   date: '2016-05-08',
-        //   name: '王小虎',
-        //   province: '上海',
-        //   city: '普陀区',
-        //   address: '上海市普陀区金沙江路 1518 弄',
-        //   zip: 200333
-        // }, {
-        //   date: '2016-05-06',
-        //   name: '王小虎',
-        //   province: '上海',
-        //   city: '普陀区',
-        //   address: '上海市普陀区金沙江路 1518 弄',
-        //   zip: 200333
-        // }, {
-        //   date: '2016-05-07',
-        //   name: '王小虎',
-        //   province: '上海',
-        //   city: '普陀区',
-        //   address: '上海市普陀区金沙江路 1518 弄',
-        //   zip: 200333
-        // }]
       }
     },
     created() {
       this.getStaffList();
+      this.getOrderStatistics();
       this.getList();
     },
     methods:{
+      // 订单统计
+      getOrderStatistics() {
+        orderStatisticsApi().then(res=>{
+          this.orderStatistics = res.data
+        })
+      },
       // 补打
       patchwork(data){
         const orderNo = data.orderNo
@@ -406,6 +402,7 @@
       handleQuery() {
         this.queryParams.page = 1;
         this.getList();
+        this.getOrderStatistics();
       },
       // 重置按钮操作
       resetQuery() {

fuintCashierWeb/src/views/cashier/orderComponents/order_Ordinary.vue

@@ -42,9 +42,29 @@
         <span>小程序订单统计</span>
       </div>
       <div class="box-gang">
-        <div class="box" v-for="(item,index) in 7" :key="index">
+        <div class="box">
-          <div class="size-hui">订单总数</div>
+          <div class="size-hui">笔数</div>
-          <div class="size-bole">55</div>
+          <div class="size-bole">{{ orderStatistics.numberOfStrokes }}</div>
+        </div>
+        <div class="box">
+          <div class="size-hui">订单总金额</div>
+          <div class="size-bole">{{ orderStatistics.theTotalAmountOfTheOrder }}</div>
+        </div>
+        <div class="box">
+          <div class="size-hui">实付总金额</div>
+          <div class="size-bole">{{ orderStatistics.theTotalAmountPaid }}</div>
+        </div>
+        <div class="box">
+          <div class="size-hui">油品优惠</div>
+          <div class="size-bole">{{ orderStatistics.oilDiscounts }}</div>
+        </div>
+        <div class="box">
+          <div class="size-hui">油品总金额</div>
+          <div class="size-bole">{{ orderStatistics.theTotalAmountOfOil }}</div>
+        </div>
+        <div class="box">
+          <div class="size-hui">商品总金额</div>
+          <div class="size-bole">{{ orderStatistics.theTotalAmountOfTheItem?orderStatistics.theTotalAmountOfTheItem:0 }}</div>
         </div>
 
       </div>
@@ -197,7 +217,7 @@
 </template>
 
 <script>
-import {cashierOrder, listCashierOrder} from "@/api/cashier/cashierorder";
+import {cashierOrder, listCashierOrder, orderStatisticsApi} from "@/api/cashier/cashierorder";
 import {getDicts} from "@/api/dict/data";
 import {queryStaffs} from "@/api/cashier/staff";
 
@@ -232,13 +252,29 @@ import {queryStaffs} from "@/api/cashier/staff";
         formLabelAlign: {
           name: '',
         },
+        orderStatistics:{
+          numberOfStrokes:'0',
+          theTotalAmountOfTheOrder:'0',
+          theTotalAmountPaid:'0',
+          oilDiscounts:'0',
+          theTotalAmountOfOil:'0',
+          theTotalAmountOfTheItem:'0',
+        },
       }
     },
     created() {
       this.getList();
+      this.getOrderStatistics();
+
       this.getTerList();
     },
     methods:{
+      // 获取订单统计信息
+      getOrderStatistics() {
+        orderStatisticsApi(this.addDateRange(this.queryParams, this.dateRange)).then(res=>{
+          this.orderStatistics = res.data
+        })
+      },
       // 获取员工姓名
       getRealName(list,val){
         let name = "";
@@ -308,6 +344,7 @@ import {queryStaffs} from "@/api/cashier/staff";
       handleQuery() {
         this.queryParams.page = 1;
         this.getList();
+        this.getOrderStatistics();
       },
       // 重置按钮操作
       resetQuery() {

fuintCashierWeb/src/views/cashier/orderComponents/order_Unpaid.vue

@@ -85,10 +85,39 @@
         <span>未支付订单统计</span>
       </div>
       <div class="box-gang">
-        <div class="box" v-for="(item,index) in 7" :key="index">
+        <div class="box">
-          <div class="size-hui">订单总数</div>
+          <div class="size-hui">油品笔数</div>
-          <div class="size-bole">55</div>
+          <div class="size-bole">{{orderStatistics.numberOfOilPens}}</div>
         </div>
+        <div class="box">
+          <div class="size-hui">油品总金额</div>
+          <div class="size-bole">{{orderStatistics.theTotalAmountOfOil}}</div>
+        </div>
+        <div class="box">
+          <div class="size-hui">优惠总额</div>
+          <div class="size-bole">{{orderStatistics.theTotalAmountOfTheOffer}}</div>
+        </div>
+        <div class="box">
+          <div class="size-hui">交易数量</div>
+          <div class="size-bole">{{orderStatistics.numberOfTransactions}}</div>
+        </div>
+        <div class="box">
+          <div class="size-hui">实收总额</div>
+          <div class="size-bole">{{orderStatistics.totalAmountReceived}}</div>
+        </div>
+        <div class="box">
+          <div class="size-hui">微信</div>
+          <div class="size-bole">{{orderStatistics.wechat}}</div>
+        </div>
+        <div class="box">
+          <div class="size-hui">支付宝</div>
+          <div class="size-bole">{{orderStatistics.alipay}}</div>
+        </div>
+        <div class="box">
+          <div class="size-hui">现金</div>
+          <div class="size-bole">{{orderStatistics.cash}}</div>
+        </div>
+
 
       </div>
     </el-card>
@@ -176,7 +205,7 @@
 </template>
 
 <script>
-  import {listOilOrder} from "@/api/cashier/oilorder";
+  import {listOilOrder,orderStatisticsApi} from "@/api/cashier/oilorder";
   import {getDicts} from "@/api/dict/data";
   import {getOilNameList, getOilNumGun} from "@/api/cashier/oilnumgun";
   import {queryStaffs} from "@/api/cashier/staff";
@@ -211,63 +240,31 @@
         formLabelAlign: {
           name: '',
         },
-        // tableData: [{
+        orderStatistics: {
-        //   date: '2016-05-03',
+          numberOfOilPens:'0',
-        //   name: '王小狼',
+          theTotalAmountOfOil:'0',
-        //   province: '上海',
+          theTotalAmountOfTheOffer:'0',
-        //   city: '普陀区',
+          numberOfTransactions:'0',
-        //   address: '上海市普陀区金沙江路 1518 弄',
+          totalAmountReceived:'0',
-        //   zip: 200333
+          wechat:'0',
-        // }, {
+          alipay:'0',
-        //   date: '2016-05-02',
+          cash:'0',
-        //   name: '王小虎',
+        }
-        //   province: '上海',
-        //   city: '普陀区',
-        //   address: '上海市普陀区金沙江路 1518 弄',
-        //   zip: 200333
-        // }, {
-        //   date: '2016-05-04',
-        //   name: '王小虎',
-        //   province: '上海',
-        //   city: '普陀区',
-        //   address: '上海市普陀区金沙江路 1518 弄',
-        //   zip: 200333
-        // }, {
-        //   date: '2016-05-01',
-        //   name: '王小虎',
-        //   province: '上海',
-        //   city: '普陀区',
-        //   address: '上海市普陀区金沙江路 1518 弄',
-        //   zip: 200333
-        // }, {
-        //   date: '2016-05-08',
-        //   name: '王小虎',
-        //   province: '上海',
-        //   city: '普陀区',
-        //   address: '上海市普陀区金沙江路 1518 弄',
-        //   zip: 200333
-        // }, {
-        //   date: '2016-05-06',
-        //   name: '王小虎',
-        //   province: '上海',
-        //   city: '普陀区',
-        //   address: '上海市普陀区金沙江路 1518 弄',
-        //   zip: 200333
-        // }, {
-        //   date: '2016-05-07',
-        //   name: '王小虎',
-        //   province: '上海',
-        //   city: '普陀区',
-        //   address: '上海市普陀区金沙江路 1518 弄',
-        //   zip: 200333
-        // }]
       }
     },
     created() {
       this.getList();
+      this.getOrderStatistics();
       this.getPayList();
     },
     methods:{
+      // 获取订单统计信息
+
+      getOrderStatistics() {
+        orderStatisticsApi(this.addDateRange(this.queryParams, this.dateRange)).then(res=>{
+          this.orderStatistics = res.data
+        })
+      },
       // 获取员工姓名
       getRealName(list,val){
         let name = "";

fuintCashierWeb/src/views/cashier/orderComponents/order_Vip.vue

@@ -68,9 +68,34 @@
         <span>会员充值统计</span>
       </div>
       <div class="box-gang">
-        <div class="box" v-for="(item,index) in 7" :key="index">
+
-          <div class="size-hui">订单总数</div>
+        <div class="box">
-          <div class="size-bole">55</div>
+          <div class="size-hui">充值笔数</div>
+          <div class="size-bole">{{orderStatistics.numberOfTopUps?orderStatistics.numberOfTopUps:0}}</div>
+        </div>
+        <div class="box">
+          <div class="size-hui">充值总金额</div>
+          <div class="size-bole">{{orderStatistics.theTotalAmountOfTopUp?orderStatistics.theTotalAmountOfTopUp:0}}</div>
+        </div>
+        <div class="box">
+          <div class="size-hui">赠送总额</div>
+          <div class="size-bole">{{orderStatistics.theTotalAmountOfTheCredit?orderStatistics.theTotalAmountOfTheCredit:0}}</div>
+        </div>
+        <div class="box">
+          <div class="size-hui">实收总额</div>
+          <div class="size-bole">{{orderStatistics.totalAmountReceived?orderStatistics.totalAmountReceived:0}}</div>
+        </div>
+        <div class="box">
+          <div class="size-hui">微信</div>
+          <div class="size-bole">{{orderStatistics.wechat?orderStatistics.wechat:0}}</div>
+        </div>
+        <div class="box">
+          <div class="size-hui">支付宝</div>
+          <div class="size-bole">{{orderStatistics.alipay?orderStatistics.alipay:0}}</div>
+        </div>
+        <div class="box">
+          <div class="size-hui">现金</div>
+          <div class="size-bole">{{orderStatistics.cash}}</div>
         </div>
 
       </div>
@@ -197,7 +222,7 @@
 </template>
 
 <script>
-import {cardValueRecordInfo, listCardValueRecord} from "@/api/cashier/cardvaluerecord";
+import {cardValueRecordInfo, listCardValueRecord, orderStatisticsApi} from "@/api/cashier/cardvaluerecord";
 import {getDicts} from "@/api/dict/data";
 import {queryStaffs} from "@/api/cashier/staff";
 
@@ -230,63 +255,31 @@ export default {
       formLabelAlign: {
         name: '',
       },
-      // tableData: [{
+
-      //   date: '2016-05-03',
+      orderStatistics: {
-      //   name: '王小狼',
+        numberOfTopUps:'',
-      //   province: '上海',
+        theTotalAmountOfTopUp:'',
-      //   city: '普陀区',
+        theTotalAmountOfTheCredit:'',
-      //   address: '上海市普陀区金沙江路 1518 弄',
+        totalAmountReceived:'',
-      //   zip: 200333
+        wechat:'',
-      // }, {
+        alipay:'',
-      //   date: '2016-05-02',
+        cash:'',
-      //   name: '王小虎',
+      }
-      //   province: '上海',
-      //   city: '普陀区',
-      //   address: '上海市普陀区金沙江路 1518 弄',
-      //   zip: 200333
-      // }, {
-      //   date: '2016-05-04',
-      //   name: '王小虎',
-      //   province: '上海',
-      //   city: '普陀区',
-      //   address: '上海市普陀区金沙江路 1518 弄',
-      //   zip: 200333
-      // }, {
-      //   date: '2016-05-01',
-      //   name: '王小虎',
-      //   province: '上海',
-      //   city: '普陀区',
-      //   address: '上海市普陀区金沙江路 1518 弄',
-      //   zip: 200333
-      // }, {
-      //   date: '2016-05-08',
-      //   name: '王小虎',
-      //   province: '上海',
-      //   city: '普陀区',
-      //   address: '上海市普陀区金沙江路 1518 弄',
-      //   zip: 200333
-      // }, {
-      //   date: '2016-05-06',
-      //   name: '王小虎',
-      //   province: '上海',
-      //   city: '普陀区',
-      //   address: '上海市普陀区金沙江路 1518 弄',
-      //   zip: 200333
-      // }, {
-      //   date: '2016-05-07',
-      //   name: '王小虎',
-      //   province: '上海',
-      //   city: '普陀区',
-      //   address: '上海市普陀区金沙江路 1518 弄',
-      //   zip: 200333
-      // }]
     }
   },
   created() {
     this.getList();
     this.getPayList();
+    this.getOrderStatistics()
   },
   methods:{
+    getOrderStatistics () {
+      orderStatisticsApi().then(res=>{
+        this.orderStatistics = res.data
+      })
+
+    },
+
     // 补打
     patchwork(data){
       const orderNo = data.name
@@ -325,6 +318,7 @@ export default {
     handleQuery() {
       this.queryParams.pageNo = 1;
       this.getList();
+      this.getOrderStatistics();
     },
     // 重置按钮操作
     resetQuery() {