Merge branch 'zx_saas_goods' of http://git.dayaedu.com/yonge/mec into test

mec-application/src/main/java/com/ym/mec/student/controller/RepairController.java

@@ -34,7 +34,7 @@ import java.util.Optional;
 public class RepairController extends BaseController {
 
     @Autowired
-    private SysUserFeignService sysUserFeignService;
+    private SysUserService sysUserService;
     @Autowired
     private StudentRepairService studentRepairService;
     @Autowired
@@ -50,11 +50,7 @@ public class RepairController extends BaseController {
     @PostMapping(value = "/addGoodsSellOrder")
     public HttpResponseResult addGoodsSellOrder(@RequestBody StudentGoodsSell studentGoodsSell) throws Exception {
         if(studentGoodsSell.getUserId() == null){
-            SysUser sysUser = sysUserFeignService.queryUserInfo();
-            if (sysUser == null) {
-                throw new BizException("请登录");
-            }
-            studentGoodsSell.setUserId(sysUser.getId());
+            studentGoodsSell.setUserId(sysUserService.getUserId());
         }
         if (studentGoodsSell.getIsRepeatPay() == false) {
             List<StudentPaymentOrder> list = studentPaymentOrderService.queryByCondition(GroupType.GOODS_SELL, null, studentGoodsSell.getUserId(), DealStatusEnum.ING,
@@ -94,11 +90,7 @@ public class RepairController extends BaseController {
     @ApiOperation("获取维修记录")
     @GetMapping(value = "/getStudentRepairList")
     public HttpResponseResult getStudentRepairList(RepairStudentQueryInfo queryInfo) {
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if (sysUser == null) {
-            return failed("用户信息获取失败");
-        }
-        queryInfo.setStudentId(sysUser.getId());
+        queryInfo.setStudentId(sysUserService.getUserId());
         queryInfo.setPayStatus(2);
         return succeed(studentRepairService.queryPage(queryInfo));
     }
@@ -107,7 +99,7 @@ public class RepairController extends BaseController {
     @GetMapping(value = "/getRepairInfo")
     public HttpResponseResult getRepairInfo(Integer id,Integer studentId) {
         Optional.ofNullable(studentId)
-                .map(sysUserFeignService::queryUserById)
+                .map(sysUserService::queryUserById)
                 .orElseThrow(() -> new BizException("用户信息获取失败"));
 
         StudentRepair repairInfo = studentRepairService.getRepairInfo(id);
@@ -120,31 +112,23 @@ public class RepairController extends BaseController {
     @ApiOperation("支付维修单")
     @PostMapping(value = "/payRepair")
     public HttpResponseResult payRepair(@RequestBody StudentRepair repairInfo) throws Exception {
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if (sysUser == null) {
-            return failed(HttpStatus.FORBIDDEN, "请登录");
-        }
+        sysUserService.getUser();
         return succeed(studentRepairService.payRepair(repairInfo));
     }
 
     @ApiOperation("获取维修技师信息")
     @PostMapping(value = "/getRepairer")
     public HttpResponseResult getRepairer() {
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if (sysUser == null) {
-            return failed(HttpStatus.FORBIDDEN, "请登录");
-        }
+        SysUser sysUser = sysUserService.getUser();
         return succeed(studentRepairService.getStudentRepairer(sysUser.getId(),sysUser.getOrganId()));
     }
 
     @ApiOperation(value = "分页查询商品(教材、辅件)列表")
     @GetMapping("/queryGoodsPage")
     public Object queryPage(GoodsQueryInfo queryInfo){
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if(sysUser == null){
-            throw new BizException("请先登录");
-        }
+        SysUser sysUser = sysUserService.getUser();
         queryInfo.setStudentShowOrganId(sysUser.getOrganId().toString());
+        queryInfo.setTenantId(sysUser.getTenantId());
         return succeed(goodsService.queryPage(queryInfo));
     }
 
@@ -157,11 +141,7 @@ public class RepairController extends BaseController {
     @ApiOperation(value = "分页查询学员商品订单")
     @GetMapping("/queryStudentGoodsOrders")
     public Object queryStudentGoodsOrders(GoodsSellQueryInfo queryInfo) {
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if (sysUser == null) {
-            return failed(HttpStatus.FORBIDDEN, "请登录");
-        }
-        queryInfo.setStudentId(sysUser.getId());
+        queryInfo.setStudentId(sysUserService.getUserId());
         return succeed(studentGoodsSellService.queryStudentGoodsOrders(queryInfo));
     }
 

mec-application/src/main/java/com/ym/mec/web/controller/education/EduRepairController.java

@@ -109,12 +109,6 @@ public class EduRepairController extends BaseController {
         SysUser sysUser = sysUserService.getUser();
         repairInfo.setEmployeeId(sysUser.getId());
         repairInfo.setEmployeeName(sysUser.getRealName());
-//        if(repairInfo.getSendType().equals(1)){
-//            Employee employee = employeeDao.get(sysUser.getId());
-//            if(StringUtils.isBlank(employee.getContactAddress())){
-//                return failed("联系地址为空,请联系相关人员在\"员工管理\"完善");
-//            }
-//        }
         return succeed(studentRepairService.addRepair(repairInfo));
     }
 

mec-biz/src/main/java/com/ym/mec/biz/service/impl/GoodsServiceImpl.java

@@ -7,39 +7,24 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.microsvc.toolkit.middleware.oss.OssPluginContext;
 import com.microsvc.toolkit.middleware.oss.impl.TencentOssPlugin;
 import com.ym.mec.biz.dal.dao.GoodsDao;
-import com.ym.mec.biz.dal.dao.GoodsProcurementDao;
 import com.ym.mec.biz.dal.dao.OrganizationDao;
-import com.ym.mec.biz.dal.dao.SellOrderDao;
 import com.ym.mec.biz.dal.dao.TeacherDao;
 import com.ym.mec.biz.dal.dto.BasicUserDto;
 import com.ym.mec.biz.dal.dto.GoodsSellDto;
-import com.ym.mec.biz.dal.entity.Goods;
-import com.ym.mec.biz.dal.entity.GoodsCategory;
-import com.ym.mec.biz.dal.entity.GoodsSub;
-import com.ym.mec.biz.dal.entity.Organization;
-import com.ym.mec.biz.dal.entity.SellOrder;
-import com.ym.mec.biz.dal.enums.AccountType;
-import com.ym.mec.biz.dal.enums.GoodsType;
-import com.ym.mec.biz.dal.enums.MessageTypeEnum;
-import com.ym.mec.biz.dal.enums.TemplateTypeEnum;
-import com.ym.mec.biz.dal.enums.YesOrNoEnum;
+import com.ym.mec.biz.dal.entity.*;
+import com.ym.mec.biz.dal.enums.*;
 import com.ym.mec.biz.dal.page.GoodsCategoryQueryInfo;
 import com.ym.mec.biz.dal.page.GoodsQuery;
 import com.ym.mec.biz.dal.page.GoodsQueryInfo;
 import com.ym.mec.biz.dal.wrapper.GoodsWrapper;
 import com.ym.mec.biz.service.*;
 import com.ym.mec.common.dal.BaseDAO;
-import com.ym.mec.common.dto.BrandDto;
-import com.ym.mec.common.dto.PmsProductDto;
-import com.ym.mec.common.dto.PmsProductQueryParamDto;
-import com.ym.mec.common.dto.ProductAttributeCategoryDto;
-import com.ym.mec.common.dto.ProductCategoryDto;
+import com.ym.mec.common.dto.*;
 import com.ym.mec.common.entity.GoodsSubModel;
 import com.ym.mec.common.entity.GoodsSubStockModel;
 import com.ym.mec.common.exception.BizException;
 import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.page.QueryInfo;
-import com.ym.mec.common.service.IdGeneratorService;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
 import com.ym.mec.common.tenant.TenantContextHolder;
 import com.ym.mec.mall.MallFeignService;
@@ -84,20 +69,12 @@ public class GoodsServiceImpl extends BaseServiceImpl<Integer, Goods>  implement
 	@Resource
 	private GoodsDao goodsDao;
 	@Resource
-	private UploadFileService uploadFileService;
-	@Resource
-	private IdGeneratorService idGeneratorService;
-	@Resource
-	private GoodsProcurementDao goodsProcurementDao;
-	@Resource
 	private SysTenantConfigService sysTenantConfigService;
 	@Resource
 	private SysMessageService sysMessageService;
 	@Resource
 	private TeacherDao teacherDao;
 	@Resource
-	private SellOrderDao sellOrderDao;
-	@Resource
 	private OrganizationDao organizationDao;
 	@Resource
 	private MallFeignService mallFeignService;

mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentRepairServiceImpl.java

@@ -529,13 +529,13 @@ public class StudentRepairServiceImpl extends BaseServiceImpl<Integer, StudentRe
     @Transactional(rollbackFor = Exception.class)
     public Map addRepair(StudentRepair repairInfo) throws Exception {
         studentService.getDao().lockUser(repairInfo.getEmployeeId());
-        if (repairInfo.getSendType() != null && repairInfo.getSendType().equals(1) &&
+        /*if (repairInfo.getSendType() != null && repairInfo.getSendType().equals(1) &&
                 (repairInfo.getContactName() == null || repairInfo.getContactName().isEmpty()) &&
                 (repairInfo.getContactMobile() == null || repairInfo.getContactMobile().isEmpty()) &&
                 (repairInfo.getAddress() == null || repairInfo.getAddress().isEmpty())
         ) {
             throw new BizException("邮寄信息必填");
-        }
+        }*/
         Date date = new Date();
         StudentInstrument studentInstrument = null;
         if (repairInfo.getStudentInstrumentId() != null) {