Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/com/caimei365/user/controller/RegisterApi.java

src/main/java/com/caimei365/user/controller/RegisterApi.java

@@ -48,7 +48,7 @@ public class RegisterApi {
      * @param headers         HttpHeaders
      * @return ClubPo
      */
-    @Idempotent(prefix="idempotent_club", keys={"#clubRegisterDto"}, expire=5)
+    @Idempotent(prefix="idempotent_club", keys={"#baseUser"}, expire=5)
     @PostMapping("/club")
     public ResponseJson<ClubPo> clubRegister(ClubRegisterDto clubRegisterDto,
                                              String passWordConfirm,
@@ -124,7 +124,7 @@ public class RegisterApi {
      * @param headers         HttpHeaders
      * @return ShopPo
      */
-    @Idempotent(prefix="idempotent_shop", keys={"#shopRegisterDto"}, expire=5)
+    @Idempotent(prefix="idempotent_shop", keys={"#baseUser"}, expire=5)
     @PostMapping("/shop/pc")
     public ResponseJson<ShopPo> shopPcRegister(ShopRegisterDto shopRegisterDto,
                                                String passWordConfirm,
@@ -164,6 +164,7 @@ public class RegisterApi {
      * @param headers         HttpHeaders
      * @return ShopPo
      */
+    @Idempotent(prefix="idempotent_shop", keys={"#baseUser"}, expire=5)
     @PostMapping("/shop/applets")
     public ResponseJson shopAppletsRegister(ShopRegisterDto shopRegisterDto,
                                             String passWordConfirm,

src/main/java/com/caimei365/user/model/dto/ShopRegisterDto.java

@@ -62,19 +62,19 @@ public class ShopRegisterDto implements Serializable {
      */
     private String socialCreditCode;
     /**
-     * 营业执照
+     * 营业执照(businessLicenseImage)
      */
-    private String businessLicenseImage;
+    private String businessLicense;
     /**
      * 医疗=1和非医疗=2
      */
     private String firstShopType;
     /**
-     * 医疗的二级分类 一类器械=1、二类器械 =2、三类器械=3、其他=4 /// 1和非医疗没有二级分类
+     * 医疗的二级分类 一类器械=1、二类器械 =2、三类器械=3、其他=4 /// 一级分类非医疗没有二级分类
      */
     private String secondShopType;
     /**
      * 主打项目(mainpro)
      */
-    private String mainPro;
+    private String mainProduct;
 }

src/main/java/com/caimei365/user/model/po/ShopPo.java

@@ -83,9 +83,9 @@ public class ShopPo implements Serializable {
      */
     private String socialCreditCode;
     /**
-     * 营业执照
+     * 营业执照(businessLicenseImage)
      */
-    private String businessLicenseImage;
+    private String businessLicense;
     /**
      * 医疗=1和非医疗=2
      */
@@ -95,9 +95,9 @@ public class ShopPo implements Serializable {
      */
     private String secondShopType;
     /**
-     * 主打项目
+     * 主打项目(mainpro)
      */
-    private String mainPro;
+    private String mainProduct;
     /**
      * 供应商欠款金额（供应商口头返佣欠款录入）
      */

src/main/java/com/caimei365/user/service/impl/RegisterServiceImpl.java

@@ -478,13 +478,13 @@ public class RegisterServiceImpl implements RegisterService {
         // 统一社会信用代码
         shop.setSocialCreditCode(shopRegisterDto.getSocialCreditCode());
         // 营业执照
-        shop.setBusinessLicenseImage(shopRegisterDto.getBusinessLicenseImage());
+        shop.setBusinessLicense(shopRegisterDto.getBusinessLicense());
         // 医疗=1和非医疗=2
         shop.setFirstShopType(shopRegisterDto.getFirstShopType());
         // 医疗的二级分类 一类器械=1、二类器械 =2、三类器械=3、其他=4 /// 1和非医疗没有二级分类
         shop.setSecondShopType(shopRegisterDto.getSecondShopType());
         // 主打项目
-        shop.setMainPro(shopRegisterDto.getMainPro());
+        shop.setMainProduct(shopRegisterDto.getMainProduct());
         // 添加时间
         shop.setAddTime(current);
         // 是否可用，1可用

src/main/resources/mapper/RegisterMapper.xml

@@ -19,7 +19,7 @@
     </insert>
     <insert id="insertShop" parameterType="com.caimei365.user.model.po.ShopPo" keyProperty="shopId" useGeneratedKeys="true">
         insert into shop(`userID`, `name`, `sname`, `linkMan`, `linkMan1`, `linkMan2`, `contractMobile`, `contractMobile1`, `contractMobile2`, `contractEmail1`, `contractEmail2`, `provinceID`, `cityID`, `townID`, `address`, `socialCreditCode`, `businessLicenseImage`, `firstShopType`, `secondShopType`, `mainpro`, `addTime`, `validFlag`, `status`)
-        values(#{userId},#{name},#{sName},#{linkMan},#{linkMan1},#{linkMan2},#{contractMobile},#{contractMobile1},#{contractMobile2},#{contractEmail1},#{contractEmail2},#{provinceId},#{cityId},#{townId},#{address},#{socialCreditCode},#{businessLicenseImage},#{firstShopType},#{secondShopType},#{mainPro},#{addTime},#{validFlag},#{status})
+        values(#{userId},#{name},#{sName},#{linkMan},#{linkMan1},#{linkMan2},#{contractMobile},#{contractMobile1},#{contractMobile2},#{contractEmail1},#{contractEmail2},#{provinceId},#{cityId},#{townId},#{address},#{socialCreditCode},#{businessLicense},#{firstShopType},#{secondShopType},#{mainProduct},#{addTime},#{validFlag},#{status})
     </insert>
     <update id="updateUserClubId">
         update user set clubID = #{clubId} where userID = #{userId}