Browse Source

购物车时效性

liangpeile 1 year ago
parent
commit
74b0ca1f21

+ 16 - 0
crmeb-front/src/main/java/com/zbkj/front/controller/NewFrontApi.java

@@ -10,6 +10,9 @@ import com.github.pagehelper.PageInfo;
 
 import com.zbkj.common.model.cat.CartShare;
 import com.zbkj.common.model.merchant.MerchantSms;
+import com.zbkj.common.model.organization.Organization;
+import com.zbkj.common.model.organization.OrganizationDepartment;
+import com.zbkj.common.model.organization.OrganizationDepartmentUser;
 import com.zbkj.common.model.product.ProductRelation;
 import com.zbkj.common.model.user.User;
 import com.zbkj.common.model.user.UserBypassAccount;
@@ -99,6 +102,8 @@ public class NewFrontApi {
     private CartShareService cartShareService;
     @Autowired
     private MerchantSmsService merchantSmsService;
+    @Autowired
+    private OrganizationDepartmentUserService organizationDepartmentUserService;
 
 
     @ApiOperation(value = "判断用户是否为企业用户还是企业子用户还是普通用户")
@@ -451,4 +456,15 @@ public class NewFrontApi {
             return "{\"code\": \"FAIL\",\"message\": \"失败\"}";
         }
     }
+
+    @ApiOperation(value = "查看部门下用户")
+    @RequestMapping(value = "departUser", method = RequestMethod.GET)
+    public CommonResult<?> departUser(@RequestParam(name = "departmentId") String departmentId) {
+        String[] split = departmentId.split(",");
+        LambdaQueryWrapper<OrganizationDepartmentUser> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.in(OrganizationDepartmentUser::getDepartmentId,split);
+        List<OrganizationDepartmentUser> list = organizationDepartmentUserService.list(queryWrapper);
+        return CommonResult.success(list);
+
+    }
 }

+ 5 - 0
crmeb-service/src/main/java/com/zbkj/service/service/impl/SystemConfigServiceImpl.java

@@ -118,6 +118,11 @@ public class SystemConfigServiceImpl extends ServiceImpl<SystemConfigDao, System
     public Boolean saveForm(SystemFormCheckRequest systemFormCheckRequest) {
         //检测form表单,并且返回需要添加的数据
         systemFormTempService.checkForm(systemFormCheckRequest);
+        List<SystemFormItemCheckRequest> fields = systemFormCheckRequest.getFields();
+        for (SystemFormItemCheckRequest field : fields) {
+            Integer value = Integer.valueOf(field.getValue());
+            this.loseTime(value);
+        }
 
         List<SystemConfig> systemConfigList = new ArrayList<>();
         //批量添加