bug修改

fuintAdmin/src/api/integral/gift.js

@@ -2,54 +2,49 @@ import request from "@/utils/request";
 
 // 查询油罐列表
 export function getGiftApi(data) {
-    return request({
+  return request({
-      url: 'business/integral/integralGift/queryByPage',
+    url: 'business/integral/integralGift/queryByPage',
-      method: 'get',
+    method: 'get',
-      params: data
+    params: data
-    })
+  })
-  }
+}
-  // 新增有关信息
+
-  export function insertGiftApi(data) {
+// 新增有关信息
-    return request({
+export function insertGiftApi(data) {
-      url: 'business/integral/integralGift',
+  return request({
-      method: 'post',
+    url: 'business/integral/integralGift',
-      data: data
+    method: 'post',
-    })
+    data: data
-  }
+  })
-  // 修改有关信息
+}
-  export function updateGiftApi(data) {
+
-    return request({
+// 修改有关信息
-      url: 'business/integral/integralGift',
+export function updateGiftApi(data) {
-      method: 'put',
+  return request({
-      data: data
+    url: 'business/integral/integralGift',
-    })
+    method: 'put',
-  }
+    data: data
-  
+  })
+}
+
+
+// 修改库存
+export function updateGiftInventoryApi(data) {
+  return request({
+    url: 'business/integral/integralGift/updateInventory',
+    method: 'get',
+    params: data
+  })
+}
+
+
+//获取全部 剩余数量 >0 的优惠券
+export function getCardCoupon(data) {
+  return request({
+    url: 'cardCoupon/queryByNum',
+    method: 'get',
+    params: data
+  })
+}
+
 
-  // 修改库存
-  export function updateGiftInventoryApi(data) {
-    return request({
-      url: 'business/integral/integralGift/updateInventory',
-      method: 'get',
-      params: data
-    })
-  }
-    
-  
-  //兑换券
-  export function getCardFavorableApi(data) {
-    return request({
-      url: 'business/marketingActivity/cardFavorable?pageNo=1&pageSize=10',
-      method: 'get',
-      params: data
-    })
-  }
-    
-  //优惠券
-  export function getCardExchangeApi(data) {
-    return request({
-      url: 'business/marketingActivity/cardExchange?pageNo=1&pageSize=10',
-      method: 'get',
-      params: data
-    })
-  }

fuintAdmin/src/views/integral/gift/gift.vue

@@ -142,10 +142,11 @@
           </template>
         </el-table-column>
       </el-table>
+<!--     分页  -->
       <pagination
         v-show="total>0"
         :total="total"
-        :page.sync="queryParams.page"
+        :page.sync="queryParams.pageNo"
         :limit.sync="queryParams.pageSize"
         @pagination="getList"
       />
@@ -652,8 +653,8 @@ export default {
       queryParams: {
         giftName: '',
         status: '',
-        page:null,
+        pageNo:1,
-        pageSize:null
+        pageSize:10
       },
       dateRange:{},
       // 遮罩层
@@ -905,7 +906,7 @@ export default {
     },
     // 搜索按钮操作
     handleQuery() {
-      this.queryParams.page = 1;
+      this.queryParams.pageNo = 1;
       this.getList();
     },
     // 修改按钮
@@ -919,48 +920,6 @@ export default {
         }
 
       });
-
-      //
-      // await this.cardFavorableApi();
-      // await this.cardExchangeApi();
-      // await this.selectGiftCategory();
-      //
-      // this.giftImages = []
-      // data.giftImages = JSON.parse(data.giftImages);
-      // data.giftImages.forEach(res=> {
-      //   let newImage = {
-      //     url: this.imagePath + res,
-      //     fileName: res
-      //   }
-      //   this.giftImages.push(newImage);
-      // }),
-      //
-      //   // data.deliveryMethod = JSON.parse(data.deliveryMethod);
-      //
-      //   console.log("data",data)
-      // this.dataForm = data;
-      // this.changeGiftType(this.dataForm.giftType)
-      // this.changeExchange(this.dataForm.exchangeMethod)
-      // this.changeExpressEDIT()
-      //
-      //
-      // console.log(" this.dataForm", this.dataForm)
-      // this.title = '修改礼品'
-      //
-      // this.open = true;
-      // this.getList();
-    },
-
-    cardFavorableApi () {
-      getCardFavorableApi().then(res=>{
-        this.cardFavorableList = res.data.records
-      })
-    },
-
-    cardExchangeApi () {
-      getCardExchangeApi().then(res=>{
-        this.cardExchangeApiList =res.data.records
-      })
     },
 
     resetQuery() {

fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/impl/IntegralGiftServiceImpl.java

@@ -68,7 +68,8 @@ public class IntegralGiftServiceImpl implements IntegralGiftService {
     public IPage<IntegralGiftVO> queryByPage(@Param("page") Page page, @Param("integralGiftCategory") IntegralGift integralGift) {
         AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
         integralGift.setStoreId(nowAccountInfo.getStoreId());
-        return integralGiftDao.queryAllByLimit(page, integralGift);
+        IPage<IntegralGiftVO> integralGiftVOIPage = integralGiftDao.queryAllByLimit(page, integralGift);
+        return integralGiftVOIPage;
     }
 
 

fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardCoupon/controller/CardCouponUserController.java

@@ -65,6 +65,7 @@ public class CardCouponUserController extends BaseController {
      */
     @PostMapping
     public ResponseObject insert(@RequestBody CardCouponUser cardCouponUser) {
+
         return getSuccessResult(this.cardCouponUserService.save(cardCouponUser));
     }
 
@@ -97,5 +98,18 @@ public class CardCouponUserController extends BaseController {
         Page page =new Page(pageNo,pageSize);
         return getSuccessResult(cardCouponUserService.queryPage(page, cardCouponUserVo));
     }
+
+    /**
+     * 根据 手机号 或 核销码   和 当前店铺id  以及 优惠券类型   兑换券 和 商品兑换券 来查询用户领取 并且 未核销的
+     * @param str  手机号 / 核销码
+     */
+    @GetMapping ("selectUserCardVerification")
+    public ResponseObject selectUserCardVerification(String str,@RequestParam (name = "couponType", required = false, defaultValue = "1,2") Integer[] couponType) {
+
+        List<CardCouponUser> list = cardCouponUserService.selectUserCardVerification(str, couponType);
+
+        return getSuccessResult(list);
+    }
+
 }
 

fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardCoupon/service/CardCouponUserService.java

@@ -59,5 +59,9 @@ public interface CardCouponUserService extends IService<CardCouponUser> {
      * @return java.util.List<com.fuint.business.marketingActivity.cardCoupon.entity.CardCouponUser>
     **/
     List<CardCouponUser> selectListByUsed(Integer userId,List<Integer> couponIdList);
+
+
+    List<CardCouponUser> selectUserCardVerification(String str, Integer[] couponType);
+
 }
 

fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardCoupon/service/impl/CardCouponUserServiceImpl.java

@@ -171,5 +171,10 @@ public class CardCouponUserServiceImpl extends ServiceImpl<CardCouponUserMapper,
                 .eq(CardCouponUser::getStatus,"1");
         return this.list(queryWrapper);
     }
+
+    @Override
+    public List<CardCouponUser> selectUserCardVerification(String str, Integer[] couponType) {
+        return null;
+    }
 }
 

fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardExchange/service/impl/CardExchangeRecordServiceImpl.java

@@ -44,7 +44,7 @@ public class CardExchangeRecordServiceImpl extends ServiceImpl<CardExchangeRecor
      */
     @Override
     public IPage select(Page page, CardExchangeRecord cardExchangeRecord) {
-        //获取当前店铺的id和连锁店id
+        // 根据 手机号 或 核销码   和 当前店铺id  以及 优惠券类型   兑换券 和 商品兑换券 来查询用户领取 并且 未核销的
         if (ObjectUtils.isNotEmpty(TokenUtil.getNowAccountInfo().getStoreId())) {
             cardExchangeRecord.setStoreId(TokenUtil.getNowAccountInfo().getStoreId());
             cardExchangeRecord.setChainStorId(storeService.getById(TokenUtil.getNowAccountInfo().getStoreId()).getChainStoreId());

fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardGiftActive/entity/CardGiftActive.java

@@ -29,10 +29,10 @@ public class CardGiftActive extends Model<CardGiftActive> {
     //礼品卡金额
     private Double cardAmount;
     //有效期开始时间
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
     private Date effectiveTimeStart;
     //有效期结束时间
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
     private Date effectiveTimeEnd;
     //卡类型比如纸卡  使用数据字典 card_gift_type
     private String cardType;

fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/CreditUnitServiceImpl.java

@@ -122,9 +122,9 @@ public class CreditUnitServiceImpl extends ServiceImpl<CreditUnitMapper, CreditU
         LJStore store = storeService.selectStoreByStoreId(nowAccountInfo.getStoreId());
         creditUnit.setStoreId(store.getId());
         creditUnit.setChainStoreId(store.getChainStoreId());
-        if (creditUnit.getStaffId()==null){
+//        if (creditUnit.getStaffId()==null){
-            creditUnit.setStaffId(nowAccountInfo.getId());
+//            creditUnit.setStaffId(nowAccountInfo.getId());
-        }
+//        }
 //        查询挂账单位是否存在
         QueryWrapper queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("unit_name",creditUnit.getUnitName());

fuintCashierWeb/src/views/cashier/NewComponents/credit.vue

@@ -1040,6 +1040,7 @@ import {getLodop} from "@/api/LodopFuncs";
         this.open1 = true
       },
       handleUpdate(data){
+        console.log("修改数据", data)
         creditUnitInfo(data.id).then(res => {
           this.form1 = res.data
           this.title = "修改挂账单位"
@@ -1068,7 +1069,7 @@ import {getLodop} from "@/api/LodopFuncs";
           this.total3 = res.data.total;
 
         })
-          this.getUnitStatistic(val)
+          this.getUnitStatistic(undefined)
       },
       getUnitStatistic(val){
         if (val!=undefined){