Merge remote-tracking branch 'origin/master'

fuintAdmin/src/api/EventMarketing/cardExchange.js

@@ -46,7 +46,7 @@ export function updateExchange(data) {
 // 删除兑换券
 export function delExchange(id) {
   return request({
-    url: '/system/exchange/' + id,
+    url: '/business/marketingActivity/cardExchange/' + id,
     method: 'delete'
   })
 }

fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue

@@ -54,7 +54,7 @@
       <el-table-column label="活动名称" align="center" prop="name" />
       <el-table-column label="适用油品" align="center" prop="adaptOil" >
         <template slot-scope="scope">
-          <span v-for="item in scope.row.adaptOil">{{ item }}, </span>
+          <span v-for="item in scope.row.adaptOils">{{ item }}, </span>
         </template>
       </el-table-column>
       <el-table-column label="满足金额" align="center" prop="participationConditionMoney" >

fuintAdmin/src/views/EventMarketing/cardExchange/index.vue

@@ -125,7 +125,16 @@
               @click="handleXia(scope.row)"
             >下线
             </el-button>
-<!--            <el-button-->
+            <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-delete"
+              v-if="scope.row.isonline == 1"
+              @click="handleDelete(scope.row)"
+            >删除
+            </el-button>
+
+            <!--            <el-button-->
 <!--              size="mini"-->
 <!--              type="text"-->
 <!--              icon="el-icon-delete"-->
@@ -225,7 +234,7 @@ import {
   delExchange,
   addExchange,
   updateExchange,
-  getqueryGoods, exchangeInfo
+  getqueryGoods
 } from '@/api/EventMarketing/cardExchange'
 
 export default {
@@ -395,7 +404,7 @@ export default {
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset()
-      exchangeInfo(row.id).then(res => {
+      getExchange(row.id).then(res => {
         this.form = res.data
       })
       // this.form = row
@@ -434,6 +443,15 @@ export default {
         }
       })
     },
+    handleDelete(data){
+      delExchange(data.id).then(res => {
+        if (res.code == 200) {
+          this.$message.success('删除成功')
+          this.getList()
+        }
+      })
+    },
+
     /** 上线操作 */
     handleShang(row) {
       let data = row

fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeConsumption/service/impl/ActiveConsumptionServiceImpl.java

@@ -1,5 +1,6 @@
 package com.fuint.business.marketingActivity.activeConsumption.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
@@ -27,12 +28,15 @@ import com.fuint.business.marketingActivity.cardFavorable.service.CardFavorableS
 import com.fuint.business.marketingActivity.cardFavorable.vo.CardFavorableVO;
 import com.fuint.business.member.entity.LJStaff;
 import com.fuint.business.member.service.ILJStaffService;
+import com.fuint.business.petrolStationManagement.entity.OilName;
 import com.fuint.business.petrolStationManagement.service.OilNameService;
 import com.fuint.business.store.service.StoreService;
 import com.fuint.business.userManager.entity.LJUserGrade;
 import com.fuint.business.userManager.service.LJUserGradeService;
 import com.fuint.common.dto.AccountInfo;
+import com.fuint.common.service.AccountService;
 import com.fuint.common.util.TokenUtil;
+import com.fuint.repository.model.TAccount;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
@@ -83,6 +87,10 @@ public class ActiveConsumptionServiceImpl extends ServiceImpl<ActiveConsumptionM
 
     @Resource
     private CardExchangeMapper cardExchangeMapper;
+    @Resource
+    private ILJStaffService staffService;
+    @Resource
+    private AccountService accountService;
 
 
 
@@ -151,9 +159,24 @@ public class ActiveConsumptionServiceImpl extends ServiceImpl<ActiveConsumptionM
         List<ActiveConsumptionVO> activeConsumptionVOList = records.stream().map(s ->{
             ActiveConsumptionVO activeConsumptionVO = new ActiveConsumptionVO();
             BeanUtils.copyProperties(s,activeConsumptionVO);
+
+            Integer[] array = Arrays.stream(s.getAdaptOil().split(","))
+                    .map(Integer::valueOf)
+                    .toArray(Integer[]::new);
+            String[] adaptOil = new String[array.length];
+            if (array.length>0) {
+                for (int i = 0;i<array.length;i++) {
+                    OilName oilName = oilNameService.selectOilNameById(array[i]);
+                    if (ObjectUtil.isNotEmpty(oilName)){
+                        adaptOil[i] = oilName.getOilName();
+                    }
+                }
+            }
+
             activeConsumptionVO.setAdaptOil(Arrays.stream(s.getAdaptOil().split(","))
                     .map(Integer::valueOf)
                     .toArray(Integer[]::new));
+            activeConsumptionVO.setAdaptOils(adaptOil);
             activeConsumptionVO.setActiveGift(s.getActiveGift().split(","));
             //获取会员等级
             String str = "";
@@ -199,6 +222,9 @@ public class ActiveConsumptionServiceImpl extends ServiceImpl<ActiveConsumptionM
             }
             activeConsumptionVO.setYouhuiTotaled(youhuiTed);
             activeConsumptionVO.setDuihuanTotaled(duihuanTed);
+
+            TAccount accountInfoById = accountService.getAccountInfoById(Integer.parseInt(s.getCreateBy()));
+            if (ObjectUtil.isNotEmpty(accountInfoById)) activeConsumption.setCreateBy(accountInfoById.getRealName());
             return activeConsumptionVO;
         }).collect(Collectors.toList());
         activeConsumptionVOSIPage.setRecords(activeConsumptionVOList);

fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardExchange/controller/CardExchangeController.java

@@ -88,12 +88,12 @@ public class CardExchangeController extends BaseController {
     /**
      * 删除数据
      *
-     * @param idList 主键结合
+     * @param id 主键结合
      * @return 删除结果
      */
-    @DeleteMapping
+    @DeleteMapping("/{id}")
-    public ResponseObject delete(@RequestParam("idList") List<Long> idList) {
+    public ResponseObject delete(@PathVariable Long id) {
-        return getSuccessResult(this.cardExchangeService.removeByIds(idList));
+        return getSuccessResult(this.cardExchangeService.removeById(id));
     }
 }
 

fuintBackend/fuint-application/src/main/java/com/fuint/business/member/service/impl/LJStaffServiceImpl.java

@@ -274,6 +274,7 @@ public class LJStaffServiceImpl extends ServiceImpl<LJStaffMapper, LJStaff> impl
                 if (tAccount.getAccountName().matches("\\d+")) {
                     tAccount.setAccountName(staff.getMobile());
                 }
+                tAccount.setRealName(staff.getRealName());
                 try {
                     accountService.editAccount(tAccount, null);
                 } catch (Exception e) {
@@ -286,6 +287,7 @@ public class LJStaffServiceImpl extends ServiceImpl<LJStaffMapper, LJStaff> impl
                 if (tAccount.getAccountName().matches("\\d+")) {
                     tAccount.setAccountName(staff.getMobile());
                 }
+                tAccount.setRealName(staff.getRealName());
                 try {
                     accountService.editAccount(tAccount, null);
                 } catch (Exception e) {