Merge remote-tracking branch 'origin/main'

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

@@ -210,7 +210,7 @@
                       :label="item1.name"
                       :value="item1.id"></el-option>
                   </el-select>
-                  <el-input style="width: 20%;margin: 0 10px" v-model="item.givePoints">
+                  <el-input style="width: 20%;margin: 0 10px" v-model="item.giftCardTotal">
                     <template slot="append">张</template>
                   </el-input>
                   <img src="@/assets/images/ljt.png" style="width: 25px;height: 25px;"
@@ -554,6 +554,7 @@ export default {
         orderType: orderType,
         vouchersId: "",
         giftCardTotal: "",
+        consumeAmount:"",
       }
       this.couponList.push(data)
     },
@@ -587,24 +588,55 @@ export default {
         }
       }
 
+      let flag = false;
       if (this.ruleForm.activeGift && this.ruleForm.activeGift.includes(0)) {
         if (!this.pointList || this.pointList.length == 0) {
           this.$message.error("请先选择赠送积分信息！")
           return;
+        }else {
+          this.pointList.forEach(item => {
+            if (!item.consumeAmount || !item.givePoints){
+              flag = true
+            }
+          })
         }
       }
+      if (flag){
+        this.$message.error("请确保赠送积分信息已经填写！")
+        return;
+      }
       if (this.ruleForm.activeGift && this.ruleForm.activeGift.includes(3)) {
         if (!this.growthValueList || this.growthValueList.length == 0) {
           this.$message.error("请先选择赠送成长值信息！")
           return;
+        }else {
+          this.growthValueList.forEach(item => {
+            if (!item.consumeAmount || !item.giveGrowthValue){
+              flag = true
+            }
+          })
         }
       }
+      if (flag){
+        this.$message.error("请确保赠送成长值信息已经填写！")
+        return;
+      }
       if (this.ruleForm.activeGift && this.ruleForm.activeGift.includes(1)) {
         if (!this.couponList || this.couponList.length == 0) {
           this.$message.error("请先选择赠送优惠券信息！")
           return;
+        }else {
+          this.couponList.forEach(item => {
+            if (!item.vouchersId || !item.giftCardTotal || !item.consumeAmount){
+              flag = true
+            }
+          })
         }
       }
+      if (flag){
+        this.$message.error("请确保赠送优惠券信息已经填写！")
+        return;
+      }
       this.$refs[formName].validate((valid) => {
         if (valid) {
           // 使用时间段

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

@@ -282,12 +282,23 @@ export default {
           return
         }
       }
+      let flag = false;
       if (this.ruleForm.courtesyReward && this.ruleForm.courtesyReward.includes("0")) {
         if (!this.couponList || this.couponList.length == 0) {
           this.$message.error("请先选择赠送优惠券信息！")
           return;
+        }else {
+          this.couponList.forEach(item => {
+            if (!item.vouchersId || !item.giftCardTotal){
+              flag = true
+            }
+          })
         }
       }
+      if (flag){
+        this.$message.error("请先确保赠送优惠券信息已经填写！")
+        return;
+      }
       if (this.ruleForm.courtesyReward && this.ruleForm.courtesyReward.includes("3")) {
         if (!this.ruleForm.points) {
           this.$message.error("请输入赠送积分！")

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

@@ -297,13 +297,14 @@
           <el-date-picker
             v-model="ruleForm.value1"
             type="datetimerange"
+            value-format="yyyy-MM-dd HH:mm:ss"
             range-separator="至"
             start-placeholder="开始日期"
             end-placeholder="结束日期">
           </el-date-picker>
         </el-form-item>
         <el-form-item label="卡类型" prop="cardType">
-          <el-select v-model="ruleForm.cardType" placeholder="请选择投放类型" style="width: 300px">
+          <el-select v-model="ruleForm.cardType" placeholder="请选择投放类型" style="width: 100%">
             <el-option v-for="dict in dict.type.card_gift_type" :key="dict.value" :label="dict.label"
                        :value="dict.value"/>
           </el-select>

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

@@ -373,7 +373,7 @@
           <el-form-item label="不适用时间段" style="width: 50%;">
             <el-radio-group v-model="ruleForm.unAvailableType">
               <div>
-                <el-radio :label="'1'" style="margin-bottom: 15px">每周
+                <el-radio label="1" style="margin-bottom: 15px">每周
                   <el-select v-model="ruleForm.unAvailableWeek" multiple placeholder="请选择周日期">
                     <el-option v-for="item in weekList" :key="item.value" :label="item.label" :value="item.value">
                     </el-option>
@@ -381,7 +381,7 @@
                 </el-radio>
               </div>
               <div>
-                <el-radio :label="'2'" style="margin-bottom: 15px">每月
+                <el-radio label="2" style="margin-bottom: 15px">每月
                   <el-select v-model="ruleForm.unAvailableDay" multiple placeholder="请选择每月固定日期">
                     <el-option v-for="item in monthList" :key="item.value" :label="item.label" :value="item.value">
                     </el-option>
@@ -852,12 +852,12 @@ export default {
     },
     addCertificate() {
       this.ruleForm = {
-        oilLimit: 1,
+        oilLimit: '',
-        sySend: 0,
+        sySend: '',
-        timeType: 1,
+        timeType: '',
-        useWithOther: 0,
+        useWithOther: '',
-        availableType: 1,
+        availableType: '',
-        unAvailableType: 1,
+        unAvailableType: '',
         name: '',
         number: '',
         quantity: '',

fuintAdmin/src/views/EventMarketing/openCardGift/birthday.vue

@@ -309,12 +309,24 @@ export default {
           return
         }
       }
+
+      let flag = false;
       if (this.ruleForm.courtesyReward && this.ruleForm.courtesyReward.includes("0")) {
         if (!this.couponList || this.couponList.length == 0) {
           this.$message.error("请先选择赠送优惠券信息！")
           return;
+        }else {
+          this.couponList.forEach(item => {
+            if (!item.vouchersId || !item.giftCardTotal){
+              flag = true;
+            }
+          })
         }
       }
+      if (flag){
+        this.$message.error("请先确保赠送优惠券信息已经填写！")
+        return;
+      }
       if (this.ruleForm.courtesyReward && this.ruleForm.courtesyReward.includes("3")) {
         if (!this.ruleForm.points) {
           this.$message.error("请输入赠送积分！")

fuintAdmin/src/views/EventMarketing/openCardGift/invite.vue

@@ -285,12 +285,24 @@ export default {
           return
         }
       }
+
+      let flag = false;
       if (this.ruleForm.rewardDisplay && this.ruleForm.rewardDisplay.includes("0")) {
         if (!this.couponList || this.couponList.length == 0) {
           this.$message.error("请先选择赠送优惠券信息！")
           return;
+        }else {
+          this.couponList.forEach(item => {
+            if (!item.vouchersId || !item.giftCardTotal){
+              flag = true;
+            }
+          })
         }
       }
+      if (flag){
+        this.$message.error("请先确保赠送优惠券信息已经填写！")
+        return;
+      }
       if (this.ruleForm.rewardDisplay && this.ruleForm.rewardDisplay.includes("3")) {
         if (!this.ruleForm.points) {
           this.$message.error("请输入赠送积分！")

fuintAdmin/src/views/EventMarketing/openCardGift/popUp.vue

@@ -375,12 +375,24 @@ export default {
           return
         }
       }
+
+      let flag = false;
       if (this.ruleForm.courtesyReward && this.ruleForm.courtesyReward.includes("0")) {
         if (!this.couponList || this.couponList.length == 0) {
           this.$message.error("请先选择赠送优惠券信息！")
           return;
+        }else {
+          this.couponList.forEach(item => {
+            if (!item.vouchersId || !item.giftCardTotal){
+              flag = true;
+            }
+          })
         }
       }
+      if (flag){
+        this.$message.error("请先确保赠送优惠券信息已经填写！")
+        return;
+      }
       this.$refs[formName].validate((valid) => {
         if (valid) {
           if (this.ruleForm.suitTimeSlotType==0){

fuintAdmin/src/views/EventMarketing/openCardGift/userConsume.vue

@@ -1,6 +1,5 @@
 <template>
   <div class="app-container">
-    推荐会员消费有礼
     <div class="cot-box">
       <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="120px" style="width: 70%;margin: 0 auto">
         <el-form-item label="活动名称" prop="name">
@@ -365,12 +364,24 @@ export default {
           return
         }
       }
+
+      let flag = false;
       if (this.ruleForm.courtesyReward && this.ruleForm.courtesyReward.includes("0")) {
         if (!this.couponList || this.couponList.length == 0) {
           this.$message.error("请先选择赠送优惠券信息！")
           return;
+        }else {
+          this.couponList.forEach(item => {
+            if (!item.vouchersId || !item.giftCardTotal){
+              flag = true;
+            }
+          })
         }
       }
+      if (flag){
+        this.$message.error("请先确保赠送优惠券信息已经填写！")
+        return;
+      }
       if (this.ruleForm.courtesyReward && this.ruleForm.courtesyReward.includes("3")) {
         if (!this.ruleForm.points) {
           this.$message.error("请输入赠送积分！")

fuintAdmin/src/views/EventMarketing/openCardGift/userRecharge.vue

@@ -313,12 +313,24 @@ export default {
           return
         }
       }
+
+      let flag = false;
       if (this.ruleForm.courtesyReward && this.ruleForm.courtesyReward.includes("0")) {
         if (!this.couponList || this.couponList.length == 0) {
           this.$message.error("请先选择赠送优惠券信息！")
           return;
+        }else {
+          this.couponList.forEach(item => {
+            if (!item.vouchersId || !item.giftCardTotal){
+              flag = true;
+            }
+          })
         }
       }
+      if (flag){
+        this.$message.error("请先确保赠送优惠券信息已经填写！")
+        return;
+      }
       if (this.ruleForm.courtesyReward && this.ruleForm.courtesyReward.includes("3")) {
         if (!this.ruleForm.points) {
           this.$message.error("请输入赠送积分！")

fuintAdmin/src/views/order/order_Added.vue

@@ -16,7 +16,7 @@
         <el-select
             v-model="queryParams.returnType"
             clearable
-            placeholder="归还状态"
+            placeholder="请选择类型"
           >
             <el-option label="挂账" value="0"></el-option>
             <el-option label="归还" value="1"></el-option>
@@ -25,7 +25,7 @@
         <el-form-item label="" prop="status">
           <el-select
             v-model="queryParams.status"
-            placeholder="订单状态"
+            placeholder="请选择订单状态"
             clearable
           >
             <el-option label="未归还" value="0"></el-option>
@@ -33,30 +33,30 @@
             <el-option label="部分归还" value="2"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="" prop="unitName">
+<!--        <el-form-item label="" prop="unitName">-->
-          <el-input
+<!--          <el-input-->
-            v-model="queryParams.unitName"
+<!--            v-model="queryParams.unitName"-->
-            placeholder="单位名称"
+<!--            placeholder="单位名称"-->
-            clearable
+<!--            clearable-->
-            @keyup.enter.native="handleQuery"
+<!--            @keyup.enter.native="handleQuery"-->
-          />
+<!--          />-->
-        </el-form-item>
+<!--        </el-form-item>-->
-        <el-form-item label="" prop="personCredit">
+<!--        <el-form-item label="" prop="personCredit">-->
-          <el-input
+<!--          <el-input-->
-            v-model="queryParams.personCredit"
+<!--            v-model="queryParams.personCredit"-->
-            placeholder="挂账人"
+<!--            placeholder="挂账人"-->
-            clearable
+<!--            clearable-->
-            @keyup.enter.native="handleQuery"
+<!--            @keyup.enter.native="handleQuery"-->
-          />
+<!--          />-->
-        </el-form-item>
+<!--        </el-form-item>-->
-        <el-form-item label="" prop="contactMobile">
+<!--        <el-form-item label="" prop="contactMobile">-->
-          <el-input
+<!--          <el-input-->
-            v-model="queryParams.contactMobile"
+<!--            v-model="queryParams.contactMobile"-->
-            placeholder="请输入挂账人联系电话"
+<!--            placeholder="请输入挂账人联系电话"-->
-            clearable
+<!--            clearable-->
-            @keyup.enter.native="handleQuery"
+<!--            @keyup.enter.native="handleQuery"-->
-          />
+<!--          />-->
-        </el-form-item>
+<!--        </el-form-item>-->
         <el-form-item label="" prop="mobile">
           <el-input
             v-model="queryParams.mobile"
@@ -94,7 +94,7 @@
         <el-form-item style="float: right">
           <el-button type="primary" icon="el-icon-search" @click="handleQuery">查询</el-button>
           <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
-          <el-button type="primary" icon="el-icon-plus" @click = "exportExcelCashier()">导出订单</el-button>
+          <el-button type="primary" @click = "exportExcelCashier()">导出</el-button>
 
         </el-form-item>
       </el-form>
@@ -126,9 +126,9 @@
             </template>
           </el-table-column>
           <el-table-column prop="realName" align="center" label="操作人"> </el-table-column>
-          <el-table-column prop="createTime" align="center" label="挂账单位创建时间" width="220">
+          <el-table-column prop="createTime" align="center" label="操作时间" width="220">
             <template slot-scope="scope">
-              <span>{{ parseTime(scope.row.createTime) }}</span>
+              <span>{{ parseTime(scope.row.updateTime) || parseTime(scope.row.createTime) }}</span>
             </template>
           </el-table-column>
 

fuintAdmin/src/views/order/order_Goods.vue

@@ -6,16 +6,53 @@
         <el-form-item label="" prop="orderNo">
           <el-input
             v-model="queryParams.orderNo"
-            placeholder="订单号"
+            placeholder="请输入订单号"
             clearable
             @input="$forceUpdate"
             @keyup.enter.native="handleQuery"
           />
         </el-form-item>
+        <el-form-item label="" prop="terminal">
+          <el-select
+            v-model="queryParams.terminal"
+            placeholder="请选择订单类型"
+            clearable
+            style="width: 240px"
+          >
+            <el-option v-for="item in terminalList"
+                       :key="item.id"
+                       :label="item.dictLabel"
+                       :value="item.dictValue">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="" prop="staffId">
+          <el-select
+            v-model="queryParams.staffId"
+            clearable
+            placeholder="请选择员工"
+          >
+            <el-option v-for="item in staffList" :key="item.id" :label="item.realName" :value="item.id">
+              <span style="float: left">{{ item.realName }}</span>
+              <span style="float: right; color: #8492a6; font-size: 13px">{{ item.mobile }}</span>
+            </el-option>
+          </el-select>
+        </el-form-item>
+
+        <el-form-item label="" prop="payUser">
+          <el-input
+            v-model="queryParams.payUser"
+            placeholder="请输入付款用户"
+            clearable
+            @input="$forceUpdate"
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+
         <el-form-item label="" prop="payType">
           <el-select
             v-model="queryParams.payType"
-            placeholder="支付类型"
+            placeholder="请选择支付方式"
             clearable
             style="width: 240px"
           >
@@ -27,29 +64,19 @@
             />
           </el-select>
         </el-form-item>
-        <el-form-item label="" prop="staffId">
+        <el-form-item label="" prop="status">
           <el-select
-            v-model="queryParams.staffId"
+            v-model="queryParams.status"
             clearable
-            placeholder="交易员工"
+            placeholder="请选择订单状态"
           >
-            <el-option v-for="item in staffList" :key="item.id" :label="item.realName" :value="item.id">
+            <el-option v-for="item in payStatusList"
-              <span style="float: left">{{ item.realName }}</span>
+                       :key="item.id"
-              <span style="float: right; color: #8492a6; font-size: 13px">{{ item.mobile }}</span>
+                       :label="item.dictLabel"
+                       :value="item.dictValue">
             </el-option>
           </el-select>
         </el-form-item>
-
-
-        <el-form-item label="" prop="payUser">
-          <el-input
-            v-model="queryParams.payUser"
-            placeholder="手机号"
-            clearable
-            @input="$forceUpdate"
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
         <el-form-item label="">
           <el-date-picker
             v-model="beginTime"
@@ -211,6 +238,8 @@ export default {
     return{
       // 终端列表
       terminalList:[],
+      // 订单状态列表
+      payStatusList:[],
       // 员工列表
       staffList:[],
       // 日期范围
@@ -400,6 +429,9 @@ export default {
       getDicts("terminal").then( response => {
         this.terminalList = response.data;
       })
+      getDicts("pay_status").then( response => {
+        this.payStatusList = response.data;
+      })
     },
     // 获取商品详情
     getGoods(id){

fuintAdmin/src/views/order/order_Oil.vue

@@ -7,19 +7,18 @@
         <el-form-item label="">
           <el-input v-model="queryParams.orderNo" clearable placeholder="请输入订单号"></el-input>
         </el-form-item>
-        <el-form-item label="" prop="payType">
+
+        <el-form-item label="" prop="terminal">
           <el-select
-            v-model="queryParams.payType"
+            v-model="queryParams.terminal"
             clearable
-            placeholder="订单类型"
+            placeholder="请选择订单类型"
           >
-            <el-option v-for="item in payList"
+            <el-option v-for="item in terminalList"
                        :key="item.id"
                        :label="item.dictLabel"
                        :value="item.dictValue">
             </el-option>
-            <el-option label="囤油卡" value="oilCard"/>
-            <el-option label="储值卡" value="balance"/>
           </el-select>
         </el-form-item>
         <el-form-item label="" prop="oilGunNum">
@@ -27,7 +26,7 @@
             v-model="queryParams.oilGunNum"
             filterable
             clearable
-            placeholder="油枪号"
+            placeholder="请选择油号油枪"
           >
             <el-option v-for="item in oilGunList"
                        :key="item.id"
@@ -38,6 +37,22 @@
             </el-option>
           </el-select>
         </el-form-item>
+
+        <el-form-item label="" prop="payType">
+          <el-select
+            v-model="queryParams.payType"
+            clearable
+            placeholder="请选择支付方式"
+          >
+            <el-option v-for="item in payList"
+                       :key="item.id"
+                       :label="item.dictLabel"
+                       :value="item.dictValue">
+            </el-option>
+            <el-option label="囤油卡" value="oilCard"/>
+            <el-option label="储值卡" value="balance"/>
+          </el-select>
+        </el-form-item>
         <el-form-item label="" prop="staffId">
           <el-select
             v-model="queryParams.staffId"
@@ -50,13 +65,18 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="" prop="terminal">
+
+        <el-form-item label="">
+          <el-input v-model="queryParams.payUser" clearable placeholder="请输入手机号"></el-input>
+        </el-form-item>
+
+        <el-form-item label="" prop="payType">
           <el-select
-            v-model="queryParams.terminal"
+            v-model="queryParams.orderStatus"
             clearable
-            placeholder="终端"
+            placeholder="请选择订单状态"
           >
-            <el-option v-for="item in terminalList"
+            <el-option v-for="item in payStatusList"
                        :key="item.id"
                        :label="item.dictLabel"
                        :value="item.dictValue">
@@ -64,11 +84,6 @@
           </el-select>
         </el-form-item>
 
-        <el-form-item label="">
-          <el-input v-model="queryParams.payUser" clearable placeholder="请输入手机号"></el-input>
-        </el-form-item>
-
-
         <el-form-item label="">
           <el-date-picker
             v-model="beginTime"
@@ -87,7 +102,7 @@
         <el-form-item style="float: right;margin-right: 0px">
           <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
           <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
-          <el-button type="primary" icon="el-icon-plus" @click="exportExcelOilOrder()">导出订单</el-button>
+          <el-button type="primary" @click="exportExcelOilOrder()">导出</el-button>
 
         </el-form-item>
       </el-form>
@@ -280,6 +295,8 @@
         terminalList:[],
         // 支付类型列表
         payList:[],
+        // 订单状态列表
+        payStatusList:[],
         // 油号列表
         oilNameList:[],
         // 油枪列表
@@ -620,6 +637,9 @@
         getDicts("payment_type").then( response => {
           this.payList = response.data;
         })
+        getDicts("pay_status").then( response => {
+          this.payStatusList = response.data;
+        })
         getOilNameList().then( response => {
           this.oilNameList = response.data;
         })

fuintAdmin/src/views/power/page/mode.vue

@@ -103,7 +103,7 @@
     </div>
 
     <el-dialog :title="title" :close-on-click-modal="false"  :visible.sync="open" width="42%" append-to-body>
-      <el-form :model="form" label-width="120px" >
+      <el-form :model="form" label-width="80px" >
         <!-- 通知名称 -->
         <el-form-item label="通知名称" :required="true">
           <el-input v-model="form.notificationName" placeholder="请输入通知名称" ></el-input>

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

@@ -92,10 +92,10 @@
         mg.name goodsName
         from integral_gift ig
         left join integral_gift_category igc ON ig.category_id = igc.id
-        left join mt_goods mg ON ig.goods_id = mg.id
+        left join (select * from mt_goods where stock >0) mg ON ig.goods_id = mg.id
         <where>
-            ig.store_id = #{integralGift.storeId} and mg.stock >0
+            ig.store_id = #{integralGift.storeId}
-
+            and ig.remaining_inventory >0
             <if test="integralGift.id != null">
                 and ig.id = #{integralGift.id}
             </if>
@@ -135,9 +135,7 @@
             <if test="integralGift.totalInventory != null">
                 and ig.total_inventory = #{integralGift.totalInventory}
             </if>
-            <if test="integralGift.remainingInventory != null">
+
-                and ig.remaining_inventory = #{integralGift.remainingInventory}
-            </if>
             <if test="integralGift.merchantCouponId != null">
                 and ig.merchant_coupon_id = #{integralGift.merchantCouponId}
             </if>

fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activePrice/service/impl/ActiveSubPriceServiceImpl.java

@@ -73,12 +73,12 @@ public class ActiveSubPriceServiceImpl extends ServiceImpl<ActiveSubPriceMapper,
      **/
     @Override
     public boolean saveActiveSubPrice(boolean isAdd, ActiveSubPriceSaveVO saveVO) {
-        if (isAdd){
+//        if (isAdd){
-            ActiveSubPrice activeSubPrice = this.selectByStoreId();
+//            ActiveSubPrice activeSubPrice = this.selectByStoreId();
-            if (ObjectUtil.isNotEmpty(activeSubPrice)){
+//            if (ObjectUtil.isNotEmpty(activeSubPrice)){
-                return false;
+//                return false;
-            }
+//            }
-        }
+//        }
         ActiveSubPrice activeSubPrice = new ActiveSubPrice();
         BeanUtils.copyProperties(saveVO, activeSubPrice);
 //        插入店铺id信息

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

@@ -53,6 +53,12 @@
             <if test="order.payType != null and order.payType != ''">
                 and pay_type = #{order.payType}
             </if>
+            <if test="order.status != null and order.status != ''">
+                and status = #{order.status}
+            </if>
+            <if test="order.terminal != null and order.terminal != ''">
+                and terminal = #{order.terminal}
+            </if>
             <if test="order.orderNo != null and order.orderNo != ''">
                 and order_no like concat('%', #{order.orderNo}, '%')
             </if>