ross需求

src/main/java/com/caimei/controller/admin/auth/ShopApi.java

@@ -128,6 +128,8 @@ public class ShopApi {
      *                                      brandLogo               品牌logo
      *                                      producePlace            产地
      *                                      manufacturer            制造商
+     *                                      producePlaceType     产地类型：1 产地 2 技术授权方
+     *                                      manufacturerType     制造商类型 1 制造商 2 制造委托方
      *                                  }
      *                              ]
      *                    }
@@ -220,6 +222,8 @@ public class ShopApi {
             String brandLogo = (String) infoMap.get("brandLogo");
             String producePlace = (String) infoMap.get("producePlace");
             String manufacturer = (String) infoMap.get("manufacturer");
+            Integer producePlaceType = (Integer) infoMap.get("producePlaceType");
+            Integer manufacturerTyp = (Integer) infoMap.get("manufacturerTyp");
             if (StringUtils.isEmpty(brandName) || StringUtils.isEmpty(brandLogo) || StringUtils.isEmpty(producePlace) || StringUtils.isEmpty(manufacturer)) {
                 return ResponseJson.error("供应商信息数据异常");
             }
@@ -234,6 +238,8 @@ public class ShopApi {
             shopInfo.setBrandLogo(brandLogo);
             shopInfo.setProducePlace(producePlace);
             shopInfo.setManufacturer(manufacturer);
+            shopInfo.setProducePlaceType(producePlaceType);
+            shopInfo.setManufacturerType(manufacturerTyp);
             shopInfoList.add(shopInfo);
         }
         return shopService.saveShop(shop, shopInfoList);

src/main/java/com/caimei/model/dto/ShopInfoDto.java

@@ -34,4 +34,12 @@ public class ShopInfoDto {
      * 制造商
      */
     private String manufacturer;
+    /**
+     * 产地类型：1 产地 2 技术授权方
+     */
+    private Integer producePlaceType;
+    /**
+     * 制造商类型 1 制造商 2 制造委托方
+     */
+    private Integer manufacturerType;
 }

src/main/java/com/caimei/model/vo/AuthProductVo.java

@@ -10,6 +10,15 @@ import java.util.List;
  */
 @Data
 public class AuthProductVo {
+    /**
+     * 产地类型：1 产地 2 技术授权方
+     */
+    private Integer producePlaceType;
+
+    /**
+     * 制造商类型 1 制造商 2 制造委托方
+     */
+    private Integer manufacturerType;
     /**
      * 商品名称
      */

src/main/java/com/caimei/model/vo/ShopInfoVo.java

@@ -34,4 +34,14 @@ public class ShopInfoVo {
      * 制造商
      */
     private String manufacturer;
+
+    /**
+     * 产地类型：1 产地 2 技术授权方
+     */
+    private Integer producePlaceType;
+
+    /**
+     * 制造商类型 1 制造商 2 制造委托方
+     */
+    private Integer manufacturerType;
 }

src/main/resources/mapper/AuthProductMapper.xml

@@ -368,6 +368,8 @@
                i.brandName        as brandName,
                i.producePlace     as producePlace,
                i.manufacturer     as manufacturer,
+               i.producePlaceType as producePlaceType,
+               i.manufacturerType as manufacturerType,
                u.authUserId       as authUserId,
                u.name             as shopName,
                u.shopType,

src/main/resources/mapper/ShopMapper.xml

@@ -7,8 +7,8 @@
         values (#{name}, #{cmShopId}, #{prefix}, #{mobile}, #{password}, #{linkMan}, #{userIdentity}, #{shopType}, #{logo}, #{qrCodeImage}, #{wxAccountType}, #{appId}, #{appSecret}, #{createTime}, #{createBy}, #{status});
     </insert>
     <insert id="insertShopInfo">
-        insert into cm_brand_auth_shop_info (authUserId, brandName, brandLogo, producePlace, manufacturer)
-        values (#{authUserId}, #{brandName}, #{brandLogo}, #{producePlace}, #{manufacturer})
+        insert into cm_brand_auth_shop_info (authUserId, brandName, brandLogo, producePlace,producePlaceType,manufacturerType, manufacturer)
+        values (#{authUserId}, #{brandName}, #{brandLogo}, #{producePlace}, #{producePlaceType}, #{manufacturerType}, #{manufacturer})
     </insert>
     <update id="updateShopStatusByUserId">
         update cm_brand_auth_user
@@ -36,7 +36,9 @@
         set brandName    = #{brandName},
             brandLogo    = #{brandLogo},
             producePlace = #{producePlace},
-            manufacturer = #{manufacturer}
+            manufacturer = #{manufacturer},
+            manufacturerType = #{manufacturerType},
+            producePlaceType = #{producePlaceType}
         where id = #{infoId}
     </update>
     <update id="handleFeedback">
@@ -205,7 +207,7 @@
         where authUserId = #{authUserId}
     </select>
     <select id="getShopInfoByUserId" resultType="com.caimei.model.vo.ShopInfoVo">
-        select i.id as infoId, i.brandName,i.brandLogo,i.producePlace,i.manufacturer
+        select i.id as infoId, i.brandName,i.brandLogo,i.producePlace,i.manufacturer,i.producePlaceType,i.manufacturerType
         from cm_brand_auth_shop_info i
         where i.authUserId = #{authUserId}
     </select>