充值

fuintAdmin/src/api/EventMarketing/cardSet.js

@@ -0,0 +1,10 @@
+import request from '@/utils/request'
+
+// 分页查询列表
+export function getCountOilTypeApi(query) {
+  return request({
+    url: 'business/marketingActivity/cardFuelDiesel/countOilType',
+    method: 'get',
+    params: query
+  })
+}

fuintAdmin/src/components/local/selectStaff.vue

@@ -0,0 +1,13 @@
+<template>
+$END$
+</template>
+
+<script>
+export default {
+name: "selectStaff"
+}
+</script>
+
+<style scoped>
+
+</style>

fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/mapper/xml/IntegralGiftMapper.xml

@@ -87,6 +87,7 @@
                ig.create_by,
                ig.update_by,
                ig.used_inventory,
+               ig.market,
                igc.category_name
         from integral_gift ig
         left join integral_gift_category igc ON ig.category_id = igc.id

fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/mapper/xml/IntegralOrdersMapper.xml

@@ -33,6 +33,11 @@
         <result property="giftName" column="gift_name" jdbcType="VARCHAR"/>
         <result property="coverImage" column="cover_image" jdbcType="VARCHAR"/>
 
+<!--        add-->
+<!--        <result property="addrName" column="addrName" jdbcType="VARCHAR"/>-->
+<!--        <result property="addrMobile" column="addrMobile" jdbcType="VARCHAR"/>-->
+        <result property="address" column="address" jdbcType="VARCHAR"/>
+
     </resultMap>
 
     <!--查询单个-->
@@ -69,10 +74,14 @@
                mu.user_no,
                mu.name,
                ig.gift_name,
-               ig.cover_image
+               ig.cover_image,
+               ea.name addrName,
+               ea.mobile addrMobile,
+               ea.address
         from integral_orders io
         left join mt_user mu ON io.user_id = mu.id
         left join integral_gift ig ON io.gift_id = ig.id
+        left join mt_user_express_address ea ON io.address_id = ea.id
         <where>
             io.store_id = #{integralOrders.storeId}
 

fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/impl/IntegralOrdersServiceImpl.java

@@ -73,7 +73,7 @@ public class IntegralOrdersServiceImpl implements IntegralOrdersService {
     }
 
     /**
-     * 修改数据
+     * 修改数据 receiving_information
      *
      * @param integralOrders 实例对象
      * @return 实例对象

fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/vo/IntegralOrdersVO.java

@@ -11,4 +11,12 @@ public class IntegralOrdersVO extends IntegralOrders {
     private String name;
     private String giftName;
     private String coverImage;
+
+    /**
+     * 地址信息
+     */
+    private String addrName;
+    private String addrMobile;
+    private String address;
+
 }

fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/controller/CardFuelDieselController.java

@@ -3,11 +3,14 @@ package com.fuint.business.marketingActivity.cardFule.controller;
 
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fuint.business.marketingActivity.cardFule.entity.CardFuelDiesel;
 import com.fuint.business.marketingActivity.cardFule.service.CardFuelDieselService;
 import com.fuint.business.store.service.StoreService;
+import com.fuint.common.dto.AccountInfo;
 import com.fuint.common.util.TokenUtil;
 import com.fuint.framework.web.BaseController;
 import com.fuint.framework.web.ResponseObject;
@@ -135,5 +138,19 @@ public class CardFuelDieselController extends BaseController {
     public ResponseObject delete(@RequestParam("idList") List<Long> idList) {
         return getSuccessResult(this.cardFuelDieselService.removeByIds(idList));
     }
+
+    /**
+     * 查询那些油品
+     * @return
+     */
+    @GetMapping("/countOilType")
+    public ResponseObject countOilType() {
+        AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
+        QueryWrapper<CardFuelDiesel> wrapper = Wrappers.query();
+        wrapper.eq("store_id", nowAccountInfo.getStoreId());
+//        wrapper.select("type", "oil_type", "COUNT(*) as count");
+        wrapper.groupBy("type", "oil_type");
+        return getSuccessResult(cardFuelDieselService.list(wrapper));
+    }
 }