Merge branch 'revert-7e3ab7f9' into 'master'

Revert "Merge branch 'fixbug/1026084' into 'master'"

See merge request rays/pcloud-book!1019

pcloud-facade-book/src/main/java/com/pcloud/book/base/exception/BookBizException.java

@@ -35,16 +35,6 @@ public class BookBizException extends BizException{
 	 * 参数为空
 	 */
 	public static final int PARAM_IS_NULL = 20210002;
-
-	/**
-	 * 库存为空
-	 */
-	public static final int STOCK_IS_EMPTY = 20210111;
-
-	/**
-	 * 库存为空
-	 */
-	public static final int HAS_RECEIVED = 20210112;
 	
 	/**
 	 * 时间格式错误

pcloud-service-book/src/main/java/com/pcloud/book/giftcoupon/biz/impl/GiftCouponPackageBizImpl.java

@@ -339,11 +339,11 @@ public class GiftCouponPackageBizImpl implements GiftCouponPackageBiz {
         Integer giftReceiveCount = giftReceiveDao.getGiftReceiveCount(giftReceive.getWechatUserId(), giftReceive.getGiftPackageId());
         //库存减一
         if(giftCouponPackage.getStock()<1){
-            throw new BookBizException(BookBizException.STOCK_IS_EMPTY, "今日库存已用完");
+            throw new BookBizException(BookBizException.PARAM_IS_NULL, "库存不够");
         }
         //超过单个奖券领取上限
         if(giftReceiveCount>=giftCouponPackage.getReceiveLimit()){
-            throw new BookBizException(BookBizException.HAS_RECEIVED, "该类型的兑换券您已经领取过，请前往“我的券库”使用吧");
+            throw new BookBizException(BookBizException.SUCCESS, "该类型的兑换券您已经领取过，请前往“我的券库”使用吧");
         }
         //超过券库总领取上限
         Integer giftAllReceiveCount =giftReceiveDao.getGiftAllReceiveCount(giftReceive.getWechatUserId());
@@ -589,9 +589,8 @@ public class GiftCouponPackageBizImpl implements GiftCouponPackageBiz {
         List<Long> list=giftCategoryDao.getByParams(map);
         Random index = new Random();
         List<Long> resultIds = new ArrayList<>();
-
+        List<Integer> indexList = new ArrayList<>();
         if(list.size()>=COUPON_MAX_SHOW_SIZE){
-            List<Integer> indexList = new ArrayList<>();
             for(int i=0,j;i<COUPON_MAX_SHOW_SIZE;i++){
                 //获取在 list.size 返回内的随机数
                 j= index.nextInt(list.size());
@@ -605,18 +604,10 @@ public class GiftCouponPackageBizImpl implements GiftCouponPackageBiz {
                 }
             }
         }else{
-            List<Integer> indexList = new ArrayList<>();
             if (!ListUtils.isEmpty(list)){
                 resultIds.addAll(list);
             }
             List<Long> list1=giftCategoryDao.getOtherByParams(map);
-            if(ListUtils.isEmpty(list1)){
-                return resultIds;
-            }
-            if(list1.size()+resultIds.size()<=COUPON_MAX_SHOW_SIZE){
-                resultIds.addAll(list1);
-                return resultIds;
-            }
             for(int i=0,j;i<COUPON_MAX_SHOW_SIZE-list.size();i++){
                 //获取在 list.size 返回内的随机数
                 j= index.nextInt(list1.size());

pcloud-service-book/src/main/java/com/pcloud/book/giftcoupon/dto/ExceptionDTO.java

@@ -8,10 +8,7 @@ import lombok.Data;
 public class ExceptionDTO {
    String errorMsg;
 
-   Integer errorCode;
-
-    public ExceptionDTO(String errorMsg,Integer errorCode) {
+    public ExceptionDTO(String errorMsg) {
         this.errorMsg = errorMsg;
-        this.errorCode=errorCode;
     }
 }

pcloud-service-book/src/main/java/com/pcloud/book/giftcoupon/facade/GiftCouponPackageFacade.java

@@ -132,11 +132,7 @@ public class GiftCouponPackageFacade {
         try {
             giftCouponPackageBiz.createGiftReceive(GiftReceive);
         }catch (BookBizException e){
-            if(BookBizException.HAS_RECEIVED==e.getCode() || BookBizException.STOCK_IS_EMPTY==e.getCode()) {
-                return new ResponseDto<>(BookBizException.SUCCESS, e.getMsg(), new ExceptionDTO(e.getMsg(), e.getCode()));
-            }else{
-                return new ResponseDto<>(e.getCode(), e.getMsg(), new ExceptionDTO(e.getMsg(), e.getCode()));
-            }
+            return new ResponseDto<>(e.getCode(),e.getMsg(),new ExceptionDTO(e.getMsg()));
         }
         return new ResponseDto<>();
     }

pcloud-service-book/src/main/resources/mapper/giftConpon/GiftCategory.xml

@@ -141,6 +141,7 @@
 
         )t on a.id=t.gift_package_id
         where a.is_delete=0
+        and a.stock>0
         and a.on_shelves=1
         and a.rec_to_page=1
         and now() <![CDATA[ < ]]> a.valid_date_end
@@ -152,8 +153,8 @@
         from
         gift_coupon_package a
         where a.is_delete=0
+        and a.stock>0
         and a.on_shelves=1
-        and a.rec_to_page=1
         and now() <![CDATA[ < ]]> a.valid_date_end
         and a.id not in
         (

pcloud-service-book/src/main/resources/mapper/giftConpon/GiftCouplePackageDao.xml

@@ -234,6 +234,7 @@
         from
         gift_coupon_package a
         where a.is_delete=0
+        and a.stock>0
         <if test="title !=null and title !=''">
             and (a.title like concat('%',#{title},'%') or a.resource_number like concat('%',#{title},'%'))
         </if>
@@ -377,6 +378,7 @@
         from
         gift_coupon_package a
         where a.is_delete=0
+        and a.stock>0
         <if test="title !=null and title !=''">
             and  (a.title like concat('%',#{title},'%') or a.url_number like concat('%',#{title},'%'))
         </if>