Przeglądaj źródła

fix:“回滚优惠券开关功能,国外账号默认开启0折优惠码功能”

soobin 1 rok temu
rodzic
commit
0bf8aed817

+ 1 - 1
src/main/java/com/szwl/controller/IndexController.java

@@ -1840,7 +1840,7 @@ public class IndexController { ;
         return "error";
     }
     /**
-     *修改优惠券开关状态
+     * 修改优惠券开关状态
      *
      * @param clientId
 

+ 3 - 0
src/main/java/com/szwl/controller/TAdminController.java

@@ -512,6 +512,9 @@ public class TAdminController {
             admin.setUsername(registerParam.getUsername());
             admin.setName(registerParam.getName());
             admin.setIfForeign(registerParam.getIfForeign());
+            if (registerParam.getIfForeign().equals("1")) {
+                admin.setPromoCodeOpen("0");
+            }
             admin.setCompanyType(registerParam.getCompanyType());
             if (Pattern.matches(phoneReg, phoneOrEmail)) {
                 admin.setPhone(registerParam.getPhoneOrEmail());

+ 3 - 19
src/main/java/com/szwl/controller/TEquipmentController.java

@@ -779,26 +779,10 @@ public class TEquipmentController {
             return R.fail(ResponseCodesEnum.A0001, "找不到设备");
         }
         TEquipmentDesc tEquipmentDesc = equipmentDescService.getById(equipment.getId());
-
-        Long adminId = equipment.getAdminId();
-        LambdaQueryWrapper<TAdmin> wrapper = Wrappers.lambdaQuery();
-        wrapper.eq(TAdmin::getId, adminId);
-        TAdmin admin = tAdminService.getOne(wrapper);
-        Integer type = admin.getType();
-//        String ifForeign = admin.getIfForeign();
-//        if (type < 2 && "0".equals(ifForeign)) {
-        if (type < 2) {
-            if (tEquipmentDesc != null) {
-                tEquipmentService.sentMessage(equipment.getClientId(), PushUtils.buildJson("couponStatus", couponStatus).toString());
-                equipment.setCouponStatus(couponStatus);
-                tEquipmentService.saveOrUpdate(equipment);
-                tEquipmentDesc.setCouponStatus(couponStatus);
-                equipmentDescService.saveOrUpdate(tEquipmentDesc);
-            } else {
-                return R.fail(ResponseCodesEnum.A0001, "找不到设备描述");
-            }
+        if (tEquipmentDesc != null) {
+            tEquipmentService.sentMessage(equipment.getClientId(), PushUtils.buildJson("couponStatus", couponStatus).toString());
         } else {
-            return R.fail("仅管理员可操作");
+            return R.fail(ResponseCodesEnum.A0001, "找不到设备");
         }
         return R.ok(null, "修改成功");
     }