ソースを参照

fix:“优化添加子账号接口,添加检验用户名是否存在接口”

soobin 1 年間 前
コミット
f6f7e206ff

+ 15 - 2
src/main/java/com/szwl/controller/TAdminController.java

@@ -152,8 +152,9 @@ public class TAdminController {
         param.setAdminId(null);
         LambdaQueryWrapper<TAdmin> query = Wrappers.lambdaQuery();
         query.eq(TAdmin::getUsername, param.getUsername());
-        List<TAdmin> list = tAdminService.list(query);
-        if (list.size() > 0) {
+//        List<TAdmin> list = tAdminService.list(query);
+        TAdmin admin = tAdminService.getOne(query);
+        if (admin != null) {
             return R.fail(ResponseCodesEnum.A0001);
         }
         TAdmin entity = BeanUtil.copyProperties(param, TAdmin.class);
@@ -1026,5 +1027,17 @@ public class TAdminController {
         }
         return R.fail(ResponseCodesEnum.A0001, "fail");
     }
+
+    @ApiOperation(value = "检验用户名是否存在")
+    @GetMapping("/checkUserName")
+    public ResponseModel<?> checkUserName(String username) {
+        LambdaQueryWrapper<TAdmin> query = Wrappers.lambdaQuery();
+        query.eq(TAdmin::getUsername, username);
+        TAdmin admin = tAdminService.getOne(query);
+        if (admin != null) {
+            return R.fail(ResponseCodesEnum.A0001);
+        }
+        return R.ok();
+    }
 }
 

+ 2 - 1
src/main/java/com/szwl/controller/TOrderController.java

@@ -535,7 +535,8 @@ public class TOrderController {
         double pri = money * number;
         price = BigDecimal.valueOf(pri);
 
-        String sn = orderService.initSn(equipmentId);
+        Long client6 = Long.parseLong(equipment.getClientId().substring(equipment.getClientId().length() - 6));
+        String sn = orderService.initSn(client6);
         String orderNo = sn;
         String productName = "280充值";
         BigDecimal cutPrice = price.multiply(new BigDecimal(100)).divide(new BigDecimal(100));

+ 5 - 5
src/main/java/com/szwl/controller/TPromoCodeController.java

@@ -379,8 +379,8 @@ public class TPromoCodeController {
                         money = price.getPrice();
                     }
                 }
-
-                String sn = orderService.initSn(equipmentId);
+                Long client6 = Long.parseLong(equipment.getClientId().substring(equipment.getClientId().length() - 6));
+                String sn = orderService.initSn(client6);
                 String orderNo = sn;
                 String productName = "优惠码";
                 BigDecimal price = BigDecimal.valueOf(money*number);
@@ -444,11 +444,11 @@ public class TPromoCodeController {
             }
 
         }
-        Long equipmentId = equipment.getId();
-
+//        Long equipmentId = equipment.getId();
+        Long client6 = Long.parseLong(equipment.getClientId().substring(equipment.getClientId().length() - 6));
         List<String> codes =new ArrayList<>();
         for(int i=0;i<number;i++){
-            String code = orderService.initSn(equipmentId);
+            String code = orderService.initSn(client6);
             StringBuffer str = new StringBuffer();
             str.append(code.substring(0,6));
             codes.add(str.toString());