Explorar el Código

添加门店不用选择设备

LuoDLeo hace 7 meses
padre
commit
225ab9ce95

+ 6 - 6
src/main/java/org/springblade/modules/api/controller/ApiShopController.java

@@ -49,14 +49,14 @@ public class ApiShopController extends BaseController {
     @ApiOperation(value = "添加门店", notes = "传入shop")
     public R<Void> save(@Valid @RequestBody Shop shop) {
         shop.setMerchantId(AuthUtil.getUserId());
-        iShopService.save(shop);
+        return R.status(iShopService.save(shop));
         //添加设备门店关联
-        List<Facility> facilityList = iFacilityService.lambdaQuery()
-                .in(Facility::getId, Func.toLongList(shop.getFacilityIds()))
-                .list();
-        facilityList.forEach((item)->item.setShopId(shop.getId()));
+//        List<Facility> facilityList = iFacilityService.lambdaQuery()
+//                .in(Facility::getId, Func.toLongList(shop.getFacilityIds()))
+//                .list();
+//        facilityList.forEach((item)->item.setShopId(shop.getId()));
 
-        return R.status(iFacilityService.updateBatchById(facilityList));
+//        return R.status(iFacilityService.updateBatchById(facilityList));
     }
 
     @Transactional

+ 1 - 2
src/main/java/org/springblade/modules/business/entity/Shop.java

@@ -1,6 +1,5 @@
 package org.springblade.modules.business.entity;
 
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
@@ -102,7 +101,7 @@ public class Shop extends BaseEntity {
 	 * 门店设备
 	 */
 //	@NotEmpty(message = "请选择门店设备")
-	@TableField(exist = false)
+//	@TableField(exist = false)
 	@ApiModelProperty(value = "门店设备id集合,以逗号分隔")
 	private String facilityIds;