提交B端修改导出中奖名单

client/components/dialog/prize-dialog/prize-dialog.js

@@ -198,7 +198,7 @@ Component({
         prizeInitData: {
           ...INIT_DATA,
           type,
-          _id:null,
+          _id: null,
           rank,
         },
       });
@@ -419,12 +419,13 @@ Component({
           this.showItemTips("imageTips", "error", "请配置奖品图片");
         }
       }
-      //库存奖品的库存值判断
-      let usePass = switchStock == 1 ? +stock >= (useStock || 0) : true;
-      console.log("stock==", stock, "useStock==", useStock, 'type===', type);
+      // 库存奖品的库存值判断
+      let usePass = switchStock == 1 ? +stock > (useStock || 0) : true;
+      // console.log("stock==", stock, "useStock==", useStock, 'type===', type);
       let intNum = /^[1-9]+[0-9]*$/;
+      let stockPass = switchStock == 1 ? (intNum.test(+stock) && +stock > 0 && +stock <= 99999) : true;
       console.log(intNum.test(+stock), +stock <= 0, +stock > 99999, usePass);
-      if (!intNum.test(+stock) || +stock <= 0 || +stock > 99999 || !usePass) {
+      if (!stockPass || !usePass) {
         this.showItemTips(
           "prizeNumberTips",
           "error",

server/duiba/service/rankopenprize.service.js

@@ -56,7 +56,7 @@ class RankopenprizeService {
   }
 
   //《条件搜索》查询中奖信息
-  async getUserPrizeByActivityId(activityId, pageNo, pageSize, prizeId, userNick, timeStart, timeEnd, shipStatus, type) {
+  async getUserPrizeByActivityId(activityId, pageNo, pageSize, prizeId, userNick, timeStart, timeEnd, shipStatus, type,prizeDataType) {
     let p = prizeId ? { _id: prizeId } : '';
     let u = userNick ? { userNick: { $regex: ".*" + userNick + ".*" } } : '';
     let c = (timeStart > 0 && timeEnd > 0) ? { createTime: { $gt: timeStart, $lt: timeEnd } } : '';
@@ -88,7 +88,7 @@ class RankopenprizeService {
 
 
   //《条件搜索》获取中奖名单长度
-  async getTotalObjectCount(activityId, prizeId, userNick, timeStart, timeEnd, shipStatus, type) {
+  async getTotalObjectCount(activityId, prizeId, userNick, timeStart, timeEnd, shipStatus, type,prizeDataType) {
     let p = prizeId ? { _id: prizeId } : '';
     let u = userNick ? { userNick: { $regex: ".*" + userNick + ".*" } } : '';
     let c = (timeStart > 0 && timeEnd > 0) ? { createTime: { $gt: timeStart, $lt: timeEnd } } : '';