添加设备

src/main/java/org/springblade/modules/business/controller/FacilityController.java

@@ -31,7 +31,9 @@ import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.modules.business.entity.Facility;
+import org.springblade.modules.business.entity.Shop;
 import org.springblade.modules.business.service.IFacilityService;
+import org.springblade.modules.business.service.IShopService;
 import org.springblade.modules.business.vo.FacilityVO;
 import org.springblade.modules.business.wrapper.FacilityWrapper;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -56,6 +58,8 @@ public class FacilityController extends BladeController {
 
 	@Autowired
 	private IFacilityService facilityService;
+	@Autowired
+	private IShopService shopService;
 
 	@Value("${qrCode.domainUrl}")
 	private String domainUrl;
@@ -135,6 +139,19 @@ public class FacilityController extends BladeController {
 	@ApiOperationSupport(order = 6)
 	@ApiOperation(value = "新增或修改", notes = "传入facility")
 	public R submit(@Valid @RequestBody Facility facility) {
+
+		//查询设备门店所属商家
+//		if (facility.getShopId() != null) {
+//			Facility facility1 = facilityService.getById(facility.getId());
+//			if (facility1 != null && !facility1.getMerchantId().equals(facility.getMerchantId())) {
+//				throw new ServiceException("设备所属商家不能修改！");
+//			}
+//		}
+
+		//获取门店所属商家
+		Shop shop = shopService.getById(facility.getShopId());
+		facility.setMerchantId(shop.getMerchantId());
+
 		return R.status(facilityService.saveOrUpdate(facility));
 	}