Prechádzať zdrojové kódy

fix:领取优惠卷bug修复

wrj 8 mesiacov pred
rodič
commit
99abfb02bf

+ 3 - 0
nightFragrance-admin/src/main/java/com/ylx/web/controller/massage/CouponReceiveController.java

@@ -3,6 +3,8 @@ package com.ylx.web.controller.massage;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ylx.common.annotation.Log;
+import com.ylx.common.enums.BusinessType;
 import com.ylx.massage.domain.Coupon;
 import com.ylx.massage.domain.CouponReceive;
 import com.ylx.common.core.domain.R;
@@ -73,6 +75,7 @@ public class CouponReceiveController {
 
     @PostMapping("submits")
     @ApiOperation("首页领取优惠卷")
+    @Log(title = "首页领取优惠卷", businessType = BusinessType.INSERT)
     public R insert(@RequestBody CouponReceivesVO couponReceive) {
         return R.ok(this.couponReceiveService.submits(couponReceive));
     }

+ 5 - 2
nightFragrance-massage/src/main/java/com/ylx/massage/service/impl/CouponReceiveServiceImpl.java

@@ -3,6 +3,7 @@ package com.ylx.massage.service.impl;
 import cn.hutool.core.collection.CollectionUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ylx.massage.domain.Coupon;
 import com.ylx.massage.domain.vo.CouponReceiveVo;
@@ -12,6 +13,7 @@ import com.ylx.massage.domain.CouponReceive;
 import com.ylx.massage.service.CouponReceiveService;
 import com.ylx.massage.service.CouponService;
 import com.ylx.massage.utils.DateTimeUtils;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.compress.utils.Lists;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -29,6 +31,7 @@ import java.util.stream.Collectors;
  * @author makejava
  * @since 2024-05-14 11:25:45
  */
+@Slf4j
 @Service("couponReceiveService")
 public class CouponReceiveServiceImpl extends ServiceImpl<CouponReceiveMapper, CouponReceive> implements CouponReceiveService {
 
@@ -65,11 +68,13 @@ public class CouponReceiveServiceImpl extends ServiceImpl<CouponReceiveMapper, C
 
         List<Coupon> list = couponService.list(queryWrapper);
         if (CollectionUtil.isEmpty(list)) {
+            log.info("优惠卷不存在");
             return null;
         }
         ArrayList<CouponReceive> couponReceives = Lists.newArrayList();
         list.forEach(coupon -> {
             CouponReceive couponRec= new CouponReceive();
+            couponRec.setId(Long.toString(IdWorker.getId(couponRec)));
             couponRec.setCouponId(coupon.getId());
             couponRec.setOpenid(couponReceive.getOpenId());
             couponRec.setDeptId(coupon.getDeptId());
@@ -120,7 +125,5 @@ public class CouponReceiveServiceImpl extends ServiceImpl<CouponReceiveMapper, C
             return Collections.emptyList();
         }
     }
-
-
 }
 

+ 3 - 3
nightFragrance-massage/src/main/resources/mapper/massage/CouponReceiveMapper.xml

@@ -42,11 +42,11 @@
          b.name, b.type, b.discount_type, b.discount_value, b.threshold_amount, b.obtain_way, b.term_days, b.status, b.used_num, b.user_limit, b.ext_param
     </sql>
     <!-- 批量插入 -->
-    <insert id="insertBatch" keyProperty="id" useGeneratedKeys="true">
-        insert into coupon_receive(openid,coupon_id,expiration_time,dept_id,dept_name,create_time,update_time,is_delete)
+    <insert id="insertBatch" keyProperty="id">
+        insert into coupon_receive(id,openid,coupon_id,expiration_time,dept_id,dept_name,create_time,update_time,is_delete)
         values
         <foreach collection="entities" item="entity" separator=",">
-            (#{entity.openid},#{entity.couponId},#{entity.expirationTime},#{entity.deptId},#{entity.deptName},#{entity.createTime},#{entity.updateTime},#{entity.isDelete})
+            (#{entity.id},#{entity.openid},#{entity.couponId},#{entity.expirationTime},#{entity.deptId},#{entity.deptName},#{entity.createTime},#{entity.updateTime},#{entity.isDelete})
         </foreach>
     </insert>
     <!-- 批量插入或按主键更新 -->