Merge remote-tracking branch 'origin/master'

vehicle-api/src/main/java/com/chelvc/cloud/vehicle/api/dto/UserCouponDTO.java

@@ -43,7 +43,7 @@ public class UserCouponDTO implements Serializable {
     /**
      * 是否已使用
      */
-    private Boolean used;
+    private Integer used;
 
     /**
      * 优惠券

vehicle-api/src/main/java/com/chelvc/cloud/vehicle/api/param/UserCouponModifyParam.java

@@ -43,7 +43,7 @@ public class UserCouponModifyParam implements Serializable {
      * 是否已使用
      */
     @NotNull(message = "是否已使用不能为空")
-    private Boolean used;
+    private Integer used;
 
     /**
      * 使用时间

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/entity/UserCoupon.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.chelvc.cloud.vehicle.api.constant.CouponType;
+import com.chelvc.cloud.vehicle.api.constant.UserCouponStatus;
 import com.chelvc.framework.database.entity.ModifyEntity;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -12,6 +13,8 @@ import lombok.NoArgsConstructor;
 import lombok.ToString;
 import lombok.experimental.SuperBuilder;
 
+import javax.validation.constraints.NotNull;
+
 /**
  * 优惠券领取数据模型
  *
@@ -49,7 +52,7 @@ public class UserCoupon extends ModifyEntity<Long> {
     /**
      * 是否已使用
      */
-    private Boolean used;
+    private Integer used;
 
     /**
      * 优惠券
@@ -61,4 +64,9 @@ public class UserCoupon extends ModifyEntity<Long> {
      * 标识：0-新消息；1-已查看
      */
     private Integer flag;
+
+    /**
+     * 用户优惠券状态
+     */
+    private UserCouponStatus status;
 }

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/impl/DynamicResourceServiceImpl.java

@@ -29,7 +29,7 @@ public class DynamicResourceServiceImpl implements DynamicResourceService {
 
     @Override
     public void batchInsert(List<DynamicResource> list) {
-        int b = baseMapper.batchInsert(list);
+        int b = this.baseMapper.batchInsert(list);
         if(b != list.size()){
             throw new ResourceUnavailableException("保存动态资源失败");
         }

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/impl/OmsOrderServiceImpl.java

@@ -227,7 +227,7 @@ public class OmsOrderServiceImpl extends ServiceImpl<OmsOrderMapper, OmsOrder> i
         omsOrderItemService.add(orderItemList);
         //如使用优惠券更新优惠券使用状态
         if (orderParam.getCouponId() != null) {
-            updateCouponStatus(orderParam.getCouponId(), userId, true);
+            updateCouponStatus(orderParam.getCouponId(), userId, 1);
         }
         //如使用积分需要扣除积分
 //        if (orderParam.getUseIntegration() != null) {
@@ -281,7 +281,7 @@ public class OmsOrderServiceImpl extends ServiceImpl<OmsOrderMapper, OmsOrder> i
             //解除订单商品库存锁定
 //            omsOrderMapper.releaseSkuStockLock(timeOutOrder.getOrderItemList());
             //修改优惠券使用状态
-            updateCouponStatus(timeOutOrder.getCouponId(), timeOutOrder.getUserId(), false);
+            updateCouponStatus(timeOutOrder.getCouponId(), timeOutOrder.getUserId(), 0);
             //返还使用积分
 //            if (timeOutOrder.getUseIntegration() != null) {
 //                UmsMember member = memberService.getById(timeOutOrder.getMemberId());
@@ -313,7 +313,7 @@ public class OmsOrderServiceImpl extends ServiceImpl<OmsOrderMapper, OmsOrder> i
 //                this.baseMapper.releaseSkuStockLock(orderItemList);
 //            }
             //修改优惠券使用状态
-            updateCouponStatus(cancelOrder.getCouponId(), cancelOrder.getUserId(), false);
+            updateCouponStatus(cancelOrder.getCouponId(), cancelOrder.getUserId(), 0);
             //返还使用积分
 //            if (cancelOrder.getUseIntegration() != null) {
 //                UmsMember member = memberService.getById(cancelOrder.getMemberId());
@@ -478,7 +478,7 @@ public class OmsOrderServiceImpl extends ServiceImpl<OmsOrderMapper, OmsOrder> i
      * @param userId  会员id
      * @param useStatus 0->未使用；1->已使用
      */
-    private void updateCouponStatus(Long couponId, Long userId, Boolean useStatus) {
+    private void updateCouponStatus(Long couponId, Long userId, Integer useStatus) {
         if (couponId == null) return;
         //查询第一张优惠券
         UserCoupon example = this.userCouponService.getUserCouponInfo(couponId,userId);

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/impl/UserCouponServiceImpl.java

@@ -133,7 +133,7 @@ public class UserCouponServiceImpl extends ServiceImpl<UserCouponMapper, UserCou
     @Override
     public Long claimCoupon(@NonNull Long couponId) {
         Coupon coupon = ResourceUtils.required(couponService.getById(couponId), "优惠券不存在");
-        if (CouponClaimType.FREE.equals(coupon.getClaimType())) {
+        if (!CouponClaimType.FREE.equals(coupon.getClaimType())) {
             throw new ResourceUnavailableException("当前优惠券不允许免费领取");
         }
         Long userId = SessionContextHolder.getId();
@@ -141,7 +141,8 @@ public class UserCouponServiceImpl extends ServiceImpl<UserCouponMapper, UserCou
         this.checkCouponLimit(coupon, userId);
         // 保存优惠券领取记录
         UserCoupon userCoupon = UserCoupon.builder().userId(userId).couponId(couponId)
-                .type(coupon.getType()).used(false).build();
+                .type(coupon.getType()).used(0).build();
+        userCoupon.setStatus(UserCouponStatus.UNUSED);
         this.save(userCoupon);
         // 修改优惠券的领取数量
         couponService.updateCouponReceivedNum(couponId, 1);
@@ -185,9 +186,9 @@ public class UserCouponServiceImpl extends ServiceImpl<UserCouponMapper, UserCou
         Integer haveCoupons = this.lambdaQuery()
                 .eq(UserCoupon::getUserId, userId)
                 .eq(UserCoupon::getCouponId, coupon.getId()).count();
-        if (!PromotionStatus.START.equals(coupon.getPromotionStatus())) {
-            throw new ResourceUnavailableException("当前优惠券已经被领取完了，下次要早点来哦");
-        }
+//        if (!PromotionStatus.START.equals(coupon.getPromotionStatus())) {
+//            throw new ResourceUnavailableException("当前优惠券已经被领取完了，下次要早点来哦");
+//        }
         if (coupon.getPublishNum() != 0 && coupon.getReceivedNum() >= coupon.getPublishNum()) {
             throw new ResourceUnavailableException("优惠券剩余领取数量不足");
         }
@@ -239,7 +240,7 @@ public class UserCouponServiceImpl extends ServiceImpl<UserCouponMapper, UserCou
         List<UserCouponDTO> userCouponList = UserCouponCopier.INSTANCE.copying(baseMapper.selectList(lwq));
         if (userCouponList != null && userCouponList.size()>0){
             userCouponList.forEach(item ->{
-                item.setCouponDTO(CouponCopier.INSTANCE.copying(this.couponService.getById(item.getId())));
+                item.setCouponDTO(CouponCopier.INSTANCE.copying(this.couponService.getById(item.getCouponId())));
                 if (CouponType.REDUCE.equals(item.getCouponDTO().getType())){
                     int comparison = amount.compareTo(new BigDecimal(item.getCouponDTO().getConsumeThreshold()));
                     if (comparison == 0) {

vehicle-server/src/main/resources/mapper/DynamicResourceMapper.xml

@@ -14,7 +14,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <insert id="batchInsert" keyColumn="id" keyProperty="list.id" parameterType="java.util.List" useGeneratedKeys="true">
         insert into dynamic_resource (id,dynamic_id,resource_frame,resource_key,sort) values
         <foreach collection="list" item="item" index="index" separator="," >
-            (#{item.id},  #{item.dynamicId}, #{item.resourceKey}, #{item.resourceFrame}, #{item.sort})
+            (#{item.id},  #{item.dynamicId}, #{item.resourceFrame},#{item.resourceKey}, #{item.sort})
         </foreach>
     </insert>
 </mapper>

vehicle-server/src/main/resources/mapper/MerchantMapper.xml

@@ -129,7 +129,7 @@
 
     <select id="getMerchantIds" resultType="java.lang.Long">
         select m.id from merchant m left join oms_cart_item ca on m.id = ca.merchant_id
-        where ca.id is not null and  ca.user_id = #{userId}
+        where ca.id is not null and  ca.user_id = #{userId} and ca.delete_status = '0'
     </select>
 
     <update id="updateMerchantBusinessStatus">

vehicle-server/src/main/resources/mapper/UserCouponMapper.xml

@@ -45,9 +45,9 @@
         from user_coupon u
         inner join coupon c on u.coupon_id = c.id
         where u.user_id = #{userId}
-        <if test="param.offset != null">
-            and u.id > #{param.offset}
-        </if>
+<!--        <if test="param.offset != null">-->
+<!--            and u.id > #{param.offset}-->
+<!--        </if>-->
         and u.type = #{param.type}
         and u.used = #{param.status}
         order by u.create_time desc