fix："修复优惠码能重复使用问题"

src/main/java/com/szwl/controller/IndexController.java

@@ -1656,6 +1656,13 @@ public class IndexController {
             parameters.setModifyDate(new Date());
             parametersService.updateById(parameters);
         }
+        if ("M502".equals(name)) {
+            TEquipmentDesc equipmentDesc = equipmentDescService.getById(equipment.getId());
+            if (equipmentDesc != null) {
+                equipmentDesc.setIsMaterialUse(val);
+                equipmentDescService.updateById(equipmentDesc);
+            }
+        }
 
         return "修改成功";
     }
@@ -2432,7 +2439,6 @@ public class IndexController {
 
     /**
      * 新修改商品名称
-     *
      */
     @RequestMapping(value = "/changeProductName", method = RequestMethod.POST)
     @ResponseBody

src/main/java/com/szwl/controller/TPromoCodeController.java

@@ -101,7 +101,6 @@ public class TPromoCodeController {
         LambdaQueryWrapper<TPromoCode> query = Wrappers.lambdaQuery();
         query.eq(TPromoCode::getCode, code);
         query.eq(TPromoCode::getAdminId, adminId);
-//        List<TPromoCode> list = promoCodeService.list(query);
         TPromoCode promoCode = promoCodeService.getOne(query);
         return R.ok(promoCode);
     }
@@ -145,12 +144,14 @@ public class TPromoCodeController {
         }
         LambdaQueryWrapper<TEquipment> query = Wrappers.lambdaQuery();
         query.eq(TEquipment::getClientId, clientId);
-        List<TEquipment> list = tEquipmentService.list(query);
-        TEquipment equipment = list.get(0);
-        LambdaQueryWrapper<TPromoCode> query1 = Wrappers.lambdaQuery();
-        query1.eq(TPromoCode::getCode, code);
-        query1.eq(TPromoCode::getAdminId, equipment.getAdminId());
-        List<TPromoCode> list1 = promoCodeService.list(query1);
+        TEquipment equipment = tEquipmentService.getOne(query);
+//        List<TEquipment> list = tEquipmentService.list(query);
+//        TEquipment equipment = list.get(0);
+        LambdaQueryWrapper<TPromoCode> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.eq(TPromoCode::getCode, code);
+        queryWrapper.eq(TPromoCode::getAdminId, equipment.getAdminId());
+        queryWrapper.eq(TPromoCode::getIsUse, "0");
+        List<TPromoCode> list1 = promoCodeService.list(queryWrapper);
         if (!list1.isEmpty()) {
             TPromoCode tPromoCode = list1.get(0);
             tPromoCode.setIsUse("1");
@@ -221,13 +222,6 @@ public class TPromoCodeController {
         }
         LambdaQueryWrapper<TPromoCode> query = Wrappers.lambdaQuery();
         query.eq(TPromoCode::getWxId, wxId);
-//        if(flag.equals("YHJ5")||flag.equals("YHJ10")){
-//            query.eq(TPromoCode::getType,"2");
-//            List<TPromoCode> list = promoCodeService.list(query);
-//            if(list.size()>0){
-//                return R.ok(1,"此券每人限领一张，您已领取过，不能再领！");
-//            }
-//        }
         query.eq(TPromoCode::getType, "2");
         List<TPromoCode> list = promoCodeService.list(query);
         if (list.size() > 0) {
@@ -240,14 +234,6 @@ public class TPromoCodeController {
         promoCode.setCode(Long.parseLong(code.substring(code.length() - 8, code.length())));
         promoCode.setAdminId(null);
         promoCode.setIsUse("0");
-//        if(flag.equals("YHJ5")){
-//            promoCode.setDiscount(5f);
-//            promoCode.setType("2");
-//        }
-//        if(flag.equals("YHJ10")){
-//            promoCode.setDiscount(10f);
-//            promoCode.setType("2");
-//        }
         String[] js = flag.split("J");
         String s = js[1];
         int price = Integer.parseInt(s);