添加可使用优惠券的商户

src/main/java/com/sqx/modules/coupon/entity/TbCoupon.java

@@ -66,5 +66,8 @@ public class TbCoupon implements Serializable {
     @TableField(exist = false)
     private Integer sysUserId;
 
+    @ApiModelProperty("优惠券可使用的商家")
+    private String usedShopId;
+
     public TbCoupon() {}
 }

src/main/java/com/sqx/modules/coupon/entity/TbCouponLog.java

@@ -63,4 +63,7 @@ public class TbCouponLog {
     @TableField(exist = false)
     private String username;
 
+    @ApiModelProperty("优惠券可使用的商家")
+    private String usedShopId;
+
 }

src/main/java/com/sqx/modules/goods/controller/GoodsShopController.java

@@ -1,5 +1,6 @@
 package com.sqx.modules.goods.controller;
 
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.sqx.common.utils.Result;
 import com.sqx.modules.datacentre.query.DataCenterQuery;
 import com.sqx.modules.goods.entity.GoodsShop;
@@ -121,9 +122,12 @@ public class GoodsShopController {
         return goodsShopService.selectGoodsShop(phone,msg);
     }
 
-        @ApiOperation("修改商户信息")
+    @ApiOperation("修改商户信息")
     @PostMapping("/updateGoodsShop")
     public Result updateGoodsShop(@RequestBody GoodsShop goodsShop){
+        if (ObjectUtils.isEmpty(goodsShop.getShopTypeId())) {
+            return Result.error("请选择商铺类型！");
+        }
         goodsShop.setStatus(0);
         goodsShop.setIsSupplier(1);
         //        默认不隐藏