From ae9ee648c604ed1750d021801da6623ff4ed94e2 Mon Sep 17 00:00:00 2001
From: zhaohengkun <zhaohengkun>
Date: Tue, 22 Oct 2024 13:35:39 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../EventMarketing/newCertificate/index.vue   | 99 ++++++++++---------
 .../controller/CardCouponUserController.java  |  2 +-
 .../cardCoupon/entity/CardCouponUser.java     |  2 +
 .../service/CardCouponUserService.java        |  2 +
 .../service/impl/CardCouponServiceImpl.java   |  9 +-
 .../impl/CardCouponUserServiceImpl.java       |  9 ++
 .../views/cashier/NewComponents/newHome.vue   |  6 +-
 7 files changed, 78 insertions(+), 51 deletions(-)

diff --git a/fuintAdmin/src/views/EventMarketing/newCertificate/index.vue b/fuintAdmin/src/views/EventMarketing/newCertificate/index.vue
index 6da6e6b7e..884a27adc 100644
--- a/fuintAdmin/src/views/EventMarketing/newCertificate/index.vue
+++ b/fuintAdmin/src/views/EventMarketing/newCertificate/index.vue
@@ -364,8 +364,10 @@
               <el-radio :label="'1'">不可用时间段</el-radio>
             </el-radio-group>
           </el-form-item>
-          <el-form-item v-if="ruleForm.availableOrUn == '0'" label="适用时间段" prop="availableType" required>
-            <div style="width: 100px;margin-top: 10px">
+
+          <div v-if="ruleForm.availableOrUn == '0'" style="margin-right: 220px">
+            <el-form-item label="适用时间段" prop="availableType" required>
+
               <el-radio-group v-model="ruleForm.availableType">
                 <div style="display: flex; width: 500px;margin-bottom: 15px;">
                   <el-radio :label="'1'">每周</el-radio>
@@ -387,37 +389,40 @@
                   </el-select>
                 </el-radio>
               </el-radio-group>
-            </div>
-            <div style="margin-top: 20px">
-              <el-form-item label="时间段" label-width="70px" prop="availablePeriodStart" required>
-                <el-time-picker
-                  v-model="ruleForm.availablePeriodStart"
-                  format="HH:mm"
-                  value-format="HH:mm"
-                  placeholder="请选择开始时间点">
-                </el-time-picker>
-                至
-                <el-time-picker
-                  v-model="ruleForm.availablePeriodEnd"
-                  format="HH:mm"
-                  value-format="HH:mm"
-                  placeholder="请选择结束时间点">
-                </el-time-picker>
-              </el-form-item>
-            </div>
-          </el-form-item>
-          <el-form-item v-else label="不适用时间段" prop="unAvailableType" required>
-            <div>
+
+            </el-form-item>
+            <el-form-item label="时间段" label-width="70px" prop="availablePeriodStart" required>
+              <el-time-picker
+                v-model="ruleForm.availablePeriodStart"
+                format="HH:mm"
+                value-format="HH:mm"
+                placeholder="请选择开始时间点">
+              </el-time-picker>
+              至
+              <el-time-picker
+                v-model="ruleForm.availablePeriodEnd"
+                format="HH:mm"
+                value-format="HH:mm"
+                placeholder="请选择结束时间点">
+              </el-time-picker>
+            </el-form-item>
+          </div>
+
+          <div v-if="ruleForm.availableOrUn == '1'" style="margin-right: 220px">
+            <el-form-item label="不适用时间段" prop="unAvailableType" required>
+
               <el-radio-group v-model="ruleForm.unAvailableType">
-                <el-radio :label="'1'">每周
+                <div style="display: flex; width: 500px;margin-bottom: 15px;">
+                  <el-radio :label="'1'">每周</el-radio>
                   <el-checkbox-group v-model="weekDay1" style="margin-left: 20px"
                                      :disabled="ruleForm.unAvailableType!='1'">
                     <el-checkbox v-for="(item,index) in weekList" :key="index" :label="item"></el-checkbox>
                   </el-checkbox-group>
-                </el-radio>
+                </div>
+
                 <el-radio :label="'2'">每月
-                  <el-select :disabled="ruleForm.unAvailableType!='2'" v-model="monthDay1" placeholder="请选择每月固定日期"
-                             multiple style="margin-left: 20px">
+                  <el-select :disabled="ruleForm.unAvailableType!='2'" v-model="monthDay1" placeholder="请选择每月固定日期" multiple
+                             style="margin-left: 20px">
                     <el-option
                       v-for="item in 31"
                       :key="item+''"
@@ -427,25 +432,25 @@
                   </el-select>
                 </el-radio>
               </el-radio-group>
-            </div>
-            <div style="margin-top: 20px">
-              <el-form-item label="时间段" prop="unAvailablePeriodStart" label-width="70px" required>
-                <el-time-picker
-                  v-model="ruleForm.unAvailablePeriodStart"
-                  format="HH:mm"
-                  value-format="HH:mm"
-                  placeholder="请选择开始时间点">
-                </el-time-picker>
-                至
-                <el-time-picker
-                  v-model="ruleForm.unAvailablePeriodEnd"
-                  format="HH:mm"
-                  value-format="HH:mm"
-                  placeholder="请选择结束时间点">
-                </el-time-picker>
-              </el-form-item>
-            </div>
-          </el-form-item>
+
+            </el-form-item>
+            <el-form-item label="时间段" label-width="70px" prop="unAvailablePeriodStart" required>
+              <el-time-picker
+                v-model="ruleForm.unAvailablePeriodStart"
+                format="HH:mm"
+                value-format="HH:mm"
+                placeholder="请选择开始时间点">
+              </el-time-picker>
+              至
+              <el-time-picker
+                v-model="ruleForm.unAvailablePeriodEnd"
+                format="HH:mm"
+                value-format="HH:mm"
+                placeholder="请选择结束时间点">
+              </el-time-picker>
+            </el-form-item>
+          </div>
+
         </div>
         <div class="d-s" style="justify-content: space-between">
           <el-form-item label="每人领券限制" required style="width: 45%;" prop="getNumLimit">
@@ -471,7 +476,7 @@
         <div class="d-s" style="justify-content: space-between">
         </div>
         <div class="d-s" style="justify-content: space-between">
-          <el-form-item label="背景图" style="width: 45%;"  required prop="backgroundImage">
+          <el-form-item label="背景图" style="width: 45%;" required prop="backgroundImage">
             <imgUpload :limit="1" v-model="ruleForm.backgroundImage"></imgUpload>
           </el-form-item>
           <el-form-item label="备注" style="width: 50%;">
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardCoupon/controller/CardCouponUserController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardCoupon/controller/CardCouponUserController.java
index 4bb6c46c5..4a8e26fe9 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardCoupon/controller/CardCouponUserController.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardCoupon/controller/CardCouponUserController.java
@@ -66,7 +66,7 @@ public class CardCouponUserController extends BaseController {
     @PostMapping
     public ResponseObject insert(@RequestBody CardCouponUser cardCouponUser) {
 
-        return getSuccessResult(this.cardCouponUserService.save(cardCouponUser));
+        return getSuccessResult(this.cardCouponUserService.insert(cardCouponUser));
     }
 
     /**
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardCoupon/entity/CardCouponUser.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardCoupon/entity/CardCouponUser.java
index a0729d5d6..26f3ead29 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardCoupon/entity/CardCouponUser.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardCoupon/entity/CardCouponUser.java
@@ -56,6 +56,8 @@ public class CardCouponUser extends Model<CardCouponUser> {
     private String updateBy;
     //更新时间
     private Date updateTime;
+    //核销码
+    private String verificationCode;
 
 
 }
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardCoupon/service/CardCouponUserService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardCoupon/service/CardCouponUserService.java
index edd644c24..5d0a3b309 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardCoupon/service/CardCouponUserService.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardCoupon/service/CardCouponUserService.java
@@ -31,6 +31,8 @@ public interface CardCouponUserService extends IService<CardCouponUser> {
      */
     boolean userCanGet(Integer couponId,Integer userId);
 
+    Boolean insert(CardCouponUser cardCouponUser);
+
     /**
      * 查会员在某店铺当前时间可用的所有优惠券
      * @author vinjor-M
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardCoupon/service/impl/CardCouponServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardCoupon/service/impl/CardCouponServiceImpl.java
index 52b41bd01..228c84a52 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardCoupon/service/impl/CardCouponServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardCoupon/service/impl/CardCouponServiceImpl.java
@@ -15,6 +15,7 @@ import com.fuint.business.marketingActivity.cardCoupon.entity.CardCouponUser;
 import com.fuint.business.marketingActivity.cardCoupon.mapper.CardCouponMapper;
 import com.fuint.business.marketingActivity.cardCoupon.mapper.CardCouponUserMapper;
 import com.fuint.business.marketingActivity.cardCoupon.service.CardCouponService;
+import com.fuint.business.marketingActivity.cardCoupon.service.CardCouponUserService;
 import com.fuint.business.marketingActivity.cardCoupon.vo.CardCouponUniVo;
 import com.fuint.business.marketingActivity.cardCoupon.vo.CardCouponVO;
 import com.fuint.business.petrolStationManagement.entity.OilName;
@@ -29,6 +30,7 @@ import com.fuint.common.dto.AccountInfo;
 import com.fuint.common.util.TokenUtil;
 import com.fuint.framework.web.ResponseObject;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -50,6 +52,9 @@ public class CardCouponServiceImpl extends ServiceImpl<CardCouponMapper, CardCou
     @Autowired
     private CardCouponUserMapper cardCouponUserMapper;
     @Autowired
+    @Lazy
+    private CardCouponUserService cardCouponUserService;
+    @Autowired
     private LJUserService userService;
     @Autowired
     private UserBalanceMapper userBalanceMapper;
@@ -191,7 +196,7 @@ public class CardCouponServiceImpl extends ServiceImpl<CardCouponMapper, CardCou
             cardCouponUser.setStartTime(cardCoupon.getEffectiveDateStart());
             cardCouponUser.setEndTime(cardCoupon.getEffectiveDateEnd());
         }
-        cardCouponUserMapper.insert(cardCouponUser);
+        cardCouponUserService.insert(cardCouponUser);
         return new ResponseObject(200, "领取成功", null);
     }
 
@@ -256,7 +261,7 @@ public class CardCouponServiceImpl extends ServiceImpl<CardCouponMapper, CardCou
         cardCouponUser.setEndTime(effectiveDateEnd);
         cardCouponUser.setCreateTime(new Date());
         cardCouponUser.setCreateBy(TokenUtil.getNowAccountInfo().getId().toString());
-        cardCouponUserMapper.insert(cardCouponUser);
+        cardCouponUserService.insert(cardCouponUser);
 
         //更新优惠券表
         if (cardCoupon.getTfGetNum() == null) cardCoupon.setTfGetNum(0);
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardCoupon/service/impl/CardCouponUserServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardCoupon/service/impl/CardCouponUserServiceImpl.java
index 4814cd5cd..296c419b5 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardCoupon/service/impl/CardCouponUserServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardCoupon/service/impl/CardCouponUserServiceImpl.java
@@ -73,6 +73,15 @@ public class CardCouponUserServiceImpl extends ServiceImpl<CardCouponUserMapper,
         return count < cardCoupon.getDayGetLimit();
     }
 
+    @Override
+    public Boolean insert(CardCouponUser cardCouponUser) {
+//   生成核销码  获取 年月日时分秒 + 随机三位数   基本可以保证不重复
+        String verificationCode = DateUtil.format(new Date(), "yyyyMMddHHmmss") + String.valueOf((int) ((Math.random() * 9 + 1) * 100));
+        cardCouponUser.setVerificationCode(verificationCode);
+        boolean save = super.save(cardCouponUser);
+        return save;
+    }
+
     /**
      * 查会员在某店铺当前时间可用的所有优惠券
      *
diff --git a/fuintCashierWeb/src/views/cashier/NewComponents/newHome.vue b/fuintCashierWeb/src/views/cashier/NewComponents/newHome.vue
index 033239471..ebb4befb9 100644
--- a/fuintCashierWeb/src/views/cashier/NewComponents/newHome.vue
+++ b/fuintCashierWeb/src/views/cashier/NewComponents/newHome.vue
@@ -922,8 +922,12 @@ export default {
       this.sendCoupon.mtUserId = this.chooseVipUser.id
       this.sendCoupon.fromType = "4"
       this.sendCoupon.cardCouponId = this.sendCoupon.id
-      //优惠卷 初始化状态应该是未使用
+      //清除 一些  重复字段
       this.sendCoupon.status = null
+      this.sendCoupon.createTime = null
+      this.sendCoupon.updateTime  = null
+      this.sendCoupon.updateBy = null
+      this.sendCoupon.createBy = null
       sendCouponFun(this.sendCoupon).then(
         res => {
           if (res.code == 200){