Browse Source

fix:"解除海外账户远程制作数量限制"

soobin 3 months ago
parent
commit
2ca3f3c128

+ 12 - 13
src/main/java/com/szwl/controller/ApkInfoController.java

@@ -34,6 +34,7 @@ public class ApkInfoController {
     TApkInfoService tApkInfoService;
     @Autowired
     TEquipmentService equipmentService;
+
     /**
      * 获得最新的更新数据
      *
@@ -44,21 +45,19 @@ public class ApkInfoController {
     @RequestMapping(value = "/apkinfo.htm", produces = "text/html;charset=utf-8")
     public String getApkInfo(String model) {
         if (StringUtils.isEmpty(model)) {
-//            return JsonMessage.error("没有版本数据");
             return "没有版本数据";
         }
         LambdaQueryWrapper<TApkInfo> query = Wrappers.lambdaQuery();
-        query.eq(TApkInfo::getModel,model);
+        query.like(TApkInfo::getModel, model);
         query.orderByDesc(TApkInfo::getVersion);
         List<TApkInfo> list = tApkInfoService.list(query);
         TApkInfo info = list.get(0);
-            if (info != null) {
-//                return JsonMessage.success(JSONObject.toJSONString(info));
-                return JSONObject.toJSONString(info);
-            }
-//            return JsonMessage.error("没有版本数据");
-            return "没有版本数据";
+        if (info != null) {
+            return JSONObject.toJSONString(info);
+        }
+        return "没有版本数据";
     }
+
     /**
      * 获得最新的更新数据
      *
@@ -69,18 +68,18 @@ public class ApkInfoController {
     @RequestMapping(value = "/getApkinfoList.htm", produces = "text/html;charset=utf-8")
     public String getApkInfoList(String model) {
         if (StringUtils.isEmpty(model)) {
-//            return JsonMessage.error("没有版本数据");
             return "没有版本数据";
         }
         LambdaQueryWrapper<TApkInfo> query = Wrappers.lambdaQuery();
-        query.eq(TApkInfo::getModel,model);
+        query.eq(TApkInfo::getModel, model);
         query.orderByDesc(TApkInfo::getVersion);
         List<TApkInfo> list = tApkInfoService.list(query);
-        if (list.size()>0) {
+        if (list.size() > 0) {
             return JSONObject.toJSONString(list);
         }
         return "没有版本数据";
     }
+
     /**
      * 系统自动更新
      *
@@ -89,9 +88,9 @@ public class ApkInfoController {
      */
     @RequestMapping(value = "/updateApk", method = RequestMethod.GET, produces = "text/html;charset=utf-8")
     @ResponseBody
-    public String separate(String clientId,String url) {
+    public String separate(String clientId, String url) {
         LambdaQueryWrapper<TEquipment> query = Wrappers.lambdaQuery();
-        query.eq(TEquipment::getClientId,clientId);
+        query.eq(TEquipment::getClientId, clientId);
         List<TEquipment> list = equipmentService.list(query);
         TEquipment equipment = list.get(0);
         if (equipment == null) {

+ 48 - 34
src/main/java/com/szwl/controller/TSugarDoController.java

@@ -72,25 +72,32 @@ public class TSugarDoController {
         if (equipmentId != null) {
             TEquipment equipment = tEquipmentService.getById(equipmentId);
             Long equipmentAdminId = equipment.getAdminId();
-            //判断本日是否已做二十个糖
-            LambdaQueryWrapper<TSugarDo> query = Wrappers.lambdaQuery();
-            query.eq(TSugarDo::getAdminId, Long.valueOf(equipmentAdminId));
 
+            // 判断是否是海外账户,海外账户不限制制作数量
+            TAdmin admin = tAdminService.getById(equipmentAdminId);
+            String ifForeign = admin.getIfForeign();
 
-            Calendar todayStart = Calendar.getInstance();
-            todayStart.set(Calendar.HOUR_OF_DAY, 0);
-            todayStart.set(Calendar.MINUTE, 0);
-            todayStart.set(Calendar.SECOND, 0);
-            query.gt(TSugarDo::getCreateDate, todayStart.getTime());
-            Calendar todayEnd = Calendar.getInstance();
-            todayEnd.set(Calendar.HOUR_OF_DAY, 23);
-            todayEnd.set(Calendar.MINUTE, 59);
-            todayEnd.set(Calendar.SECOND, 59);
-            query.le(TSugarDo::getCreateDate, todayEnd.getTime());
-            query.eq(TSugarDo::getStatus, "1");
-            List<TSugarDo> sugarDoList = tSugarDoService.list(query);
-            if (sugarDoList.size() > 20) {
-                return R.fail(ResponseCodesEnum.A0001, "做糖数量已满");
+            if (StringUtils.isNotEmpty(ifForeign) && ifForeign.equals("0")) {
+                //判断本日是否已做二十个糖
+                LambdaQueryWrapper<TSugarDo> query = Wrappers.lambdaQuery();
+                query.eq(TSugarDo::getAdminId, Long.valueOf(equipmentAdminId));
+
+
+                Calendar todayStart = Calendar.getInstance();
+                todayStart.set(Calendar.HOUR_OF_DAY, 0);
+                todayStart.set(Calendar.MINUTE, 0);
+                todayStart.set(Calendar.SECOND, 0);
+                query.gt(TSugarDo::getCreateDate, todayStart.getTime());
+                Calendar todayEnd = Calendar.getInstance();
+                todayEnd.set(Calendar.HOUR_OF_DAY, 23);
+                todayEnd.set(Calendar.MINUTE, 59);
+                todayEnd.set(Calendar.SECOND, 59);
+                query.le(TSugarDo::getCreateDate, todayEnd.getTime());
+                query.eq(TSugarDo::getStatus, "1");
+                List<TSugarDo> sugarDoList = tSugarDoService.list(query);
+                if (sugarDoList.size() > 20) {
+                    return R.fail(ResponseCodesEnum.A0001, "做糖数量已满");
+                }
             }
             StringBuilder number = new StringBuilder();
             Random random = new Random();
@@ -147,24 +154,31 @@ public class TSugarDoController {
         if (equipmentId != null) {
             TEquipment equipment = tEquipmentService.getById(equipmentId);
             Long equipmentAdminId = equipment.getAdminId();
-            //判断本日是否已做二十个糖
-            LambdaQueryWrapper<TSugarDo> query = Wrappers.lambdaQuery();
-            query.eq(TSugarDo::getAdminId, Long.valueOf(equipmentAdminId));
+            // 判断是否是海外账户,海外账户不限制制作数量
+            TAdmin admin = tAdminService.getById(equipmentAdminId);
+            String ifForeign = admin.getIfForeign();
 
-            Calendar todayStart = Calendar.getInstance();
-            todayStart.set(Calendar.HOUR_OF_DAY, 0);
-            todayStart.set(Calendar.MINUTE, 0);
-            todayStart.set(Calendar.SECOND, 0);
-            query.gt(TSugarDo::getCreateDate, todayStart.getTime());
-            Calendar todayEnd = Calendar.getInstance();
-            todayEnd.set(Calendar.HOUR_OF_DAY, 23);
-            todayEnd.set(Calendar.MINUTE, 59);
-            todayEnd.set(Calendar.SECOND, 59);
-            query.le(TSugarDo::getCreateDate, todayEnd.getTime());
-            query.eq(TSugarDo::getStatus, "1");
-            List<TSugarDo> sugarDoList = tSugarDoService.list(query);
-            if (sugarDoList.size() > 20) {
-                return R.fail(ResponseCodesEnum.A0001, "今日远程制作数量已满");
+            if (StringUtils.isNotEmpty(ifForeign) && ifForeign.equals("0")) {
+                //判断本日是否已做二十个糖
+                LambdaQueryWrapper<TSugarDo> query = Wrappers.lambdaQuery();
+                query.eq(TSugarDo::getAdminId, Long.valueOf(equipmentAdminId));
+
+
+                Calendar todayStart = Calendar.getInstance();
+                todayStart.set(Calendar.HOUR_OF_DAY, 0);
+                todayStart.set(Calendar.MINUTE, 0);
+                todayStart.set(Calendar.SECOND, 0);
+                query.gt(TSugarDo::getCreateDate, todayStart.getTime());
+                Calendar todayEnd = Calendar.getInstance();
+                todayEnd.set(Calendar.HOUR_OF_DAY, 23);
+                todayEnd.set(Calendar.MINUTE, 59);
+                todayEnd.set(Calendar.SECOND, 59);
+                query.le(TSugarDo::getCreateDate, todayEnd.getTime());
+                query.eq(TSugarDo::getStatus, "1");
+                List<TSugarDo> sugarDoList = tSugarDoService.list(query);
+                if (sugarDoList.size() > 20) {
+                    return R.fail(ResponseCodesEnum.A0001, "做糖数量已满");
+                }
             }
             StringBuilder number = new StringBuilder();
             Random random = new Random();