处理数据

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

@@ -490,7 +490,7 @@ public class CardValueServiceImpl extends ServiceImpl<CardValueMapper, CardValue
         //获取本油站消费有礼活动列表
         IPage page = selectAll(new Page(1, 20), cardValue);
         List<CardValueVO> cardValueAppletVOList = page.getRecords();
-        List<CardValueAppletVO> appletVOList = cardValueAppletVOList.stream().map(s -> {
+        return cardValueAppletVOList.stream().map(s -> {
             CardValueAppletVO cardValueAppletVO = new CardValueAppletVO();
             //活动时间
             if (s.getActiveTime().equals("1")){
@@ -523,7 +523,6 @@ public class CardValueServiceImpl extends ServiceImpl<CardValueMapper, CardValue
                     s.getRechargeBalance()+"元，赠送金额为："+s.getGiftBalance()+"元，赠送券："+card+"。");
             return cardValueAppletVO;
         }).collect(Collectors.toList());
-        return appletVOList;
     }
 
     /**

fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/mapper/xml/LJUserMapper.xml

@@ -385,7 +385,7 @@
         left join mt_user_balance mub on mu.id = mub.mt_user_id
         <where>
             mu.mobile like concat('%',#{mobile},'%')  and
-            mub.store_id = #{storeId}
+            mub.store_id = #{storeId} and mub.user_status = '0'
         </where>
     </select>
 </mapper>

fuintCashierWeb/package.json

@@ -57,6 +57,7 @@
     "screenfull": "5.0.2",
     "sortablejs": "1.10.2",
     "vue": "2.6.12",
+    "vue-clipboard2": "^0.3.3",
     "vue-count-to": "1.0.13",
     "vue-cropper": "0.5.5",
     "vue-meta": "2.4.0",

fuintCashierWeb/src/views/cashier/NewComponents/newHome.vue

@@ -7,40 +7,37 @@
             <div class="d-s">
               <img src="./imgs/new_user.png" style="width: 28px;height: 28px;margin-right: 10px">
               <div>
-                <div style="font-weight: bold">{{chooseVipUser.name}}</div>
+                <div style="font-weight: bold">{{chooseVipUser.name||'匿名'}}</div>
                 <div class="d-s">
                   <span>{{chooseVipUser.mobile}}</span>
-                  <img src="./imgs/fz.png" style="width: 17px;height: 17px;margin: 0px 10px">
+                  <img src="./imgs/fz.png" @click="copyToClipboard(chooseVipUser.mobile)" style="width: 17px;height: 17px;margin: 0px 10px">
                   <img src="./imgs/vipicon.png" style="width: 23px;height: 19px;">
                 </div>
               </div>
             </div>
             <div class="d-s">
-              <div style="font-size: 12px;margin-right: 5px">储值卡：￥1000.000 </div>
+              <div style="font-size: 12px;margin-right: 5px">储值卡：￥{{chooseVipUser.cardBalance}} </div>
               <div style="font-size: 12px">囤油卡：￥1000.000</div>
             </div>
           </div>
 
           <div class="d-s">
             <div class="an_bor" @click="addMemberRecharge()">会员充值</div>
-            <div class="an_bor">重置会员</div>
+            <div class="an_bor" @click="restVipUser">重置会员</div>
             <div class="an_bor" @click="addFreeTicket()" >赠送优惠券</div>
           </div>
         </div>
         <div class="o-top" v-if="!userInfo">
           <div class="left_input">
-<!--            <input type="text" v-model = "userMobile" @input="getUser()" placeholder="请输入会员手机号">-->
-<!--            <i class="el-icon-search" @click="getUser()"></i>-->
             <el-autocomplete
+              v-model="userMobile"
               style="width: 95%;margin: 15px "
+              :fetch-suggestions="getUser"
+              placeholder="请输入会员手机号"
 
-              v-model="state"
-              :fetch-suggestions="querySearchAsync"
-              placeholder="请输入内容"
-              @select="handleSelect"
             >
               <template slot-scope="{ item }">
-                <div class="name">{{ item.name }}</div>
+                <div class="name" @click="chooseUser(item)">{{ item.name+"        "+item.mobile }}</div>
               </template>
             </el-autocomplete>
           </div>
@@ -435,6 +432,9 @@ import refuelingAmount from './newHomeComponents/refuelingAmount.vue'
 import { cashRegisterList, cashRegisterGoodsList } from '@/api/newHome/newHome.js'
 import {QRCodeByStoreId} from "@/api/staff/qrcode";
 import {userListByPhone} from "@/api/cashier/user";
+import Vue from 'vue';
+import { VueClipboard } from 'vue-clipboard2';
+
 export default {
   data() {
     return {
@@ -592,11 +592,6 @@ export default {
 
   },
   computed: {
-    chooseUser(data){
-      //选择会员
-      this.userInfo = true
-      this.chooseVipUser = data
-    },
     getGoodsItem() {
       if (this.oilGunClearing.amount && this.oilGunClearing.amount !== undefined) {
         //  保留两位小数
@@ -629,11 +624,34 @@ export default {
 
   },
   methods: {
+    copyToClipboard(textToCopy) {
+
+      VueClipboard(textToCopy).then(() => {
+        this.$message.success("复制成功")
+        // 复制成功的操作
+      }, () => {
+        console.log('复制失败');
+        // 复制失败的操作
+      });
+    },
+    restVipUser(){
+      this.userInfo = false
+      this.chooseVipUser = {}
+    },
+    chooseUser(data){
+      if (data){
+        //选择会员
+        this.userInfo = true
+        this.chooseVipUser = data
+        console.log(this.chooseVipUser,598)
+      }
+
+    },
     // 根据手机号查询会员信息
-    getUser(){
-      userListByPhone({mobile:this.userMobile}).then( response => {
+    getUser(queryString, cb){
+      userListByPhone({mobile:queryString}).then( response => {
           if (response.data){
-            this.vipUserList = response.data
+            cb(response.data)
             console.log(response.data,608)
           }else {
             this.$modal.msgError("会员信息不存在")