Merge branch 'feature-0323' into developer

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/welcome/dto/WelcomeMediaDTO.java

@@ -46,7 +46,7 @@ public class WelcomeMediaDTO implements Serializable {
     /**
      * 小程序id,仅类型为5小程序时需要传
      */
-    private String miniProgramId;
+    private String  miniprogramSettingId;
 
     public Long getWelcomeMediaId() {
         return welcomeMediaId;
@@ -112,12 +112,12 @@ public class WelcomeMediaDTO implements Serializable {
         this.mediaSize = mediaSize;
     }
 
-    public String getMiniProgramId() {
-        return miniProgramId;
+    public String getMiniprogramSettingId() {
+        return miniprogramSettingId;
     }
 
-    public void setMiniProgramId(String miniProgramId) {
-        this.miniProgramId = miniProgramId;
+    public void setMiniprogramSettingId(String miniprogramSettingId) {
+        this.miniprogramSettingId = miniprogramSettingId;
     }
 
     @Override

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/pojo/bo/welcome/WelcomeMediaBO.java

@@ -43,7 +43,7 @@ public class WelcomeMediaBO {
     /**
      * 小程序id,仅类型为5小程序时需要传
      */
-    private String miniProgramId;
+    private String  miniprogramSettingId;
 
     public Long getWelcomeMediaId() {
         return welcomeMediaId;
@@ -109,12 +109,12 @@ public class WelcomeMediaBO {
         this.mediaSize = mediaSize;
     }
 
-    public String getMiniProgramId() {
-        return miniProgramId;
+    public String getMiniprogramSettingId() {
+        return miniprogramSettingId;
     }
 
-    public void setMiniProgramId(String miniProgramId) {
-        this.miniProgramId = miniProgramId;
+    public void setMiniprogramSettingId(String miniprogramSettingId) {
+        this.miniprogramSettingId = miniprogramSettingId;
     }
 
     @Override

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/MiniprogramSettingService.java

@@ -12,6 +12,16 @@ import java.util.List;
 public interface MiniprogramSettingService {
 
     /**
+     * desc: 根据id查询
+     *
+     * @param miniprogramSettingId
+     * @return : {@link TabMiniprogramSetting}
+     * @author : YongEn
+     * @date : 2022/3/10
+     */
+    TabMiniprogramSetting getById(String miniprogramSettingId);
+
+    /**
      * 小程序保存
      *
      * @param miniprogramSetting

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/WelcomeServiceImpl.java

@@ -123,7 +123,7 @@ public class WelcomeServiceImpl implements WelcomeService {
 
     private TabWelcome addWelcome(SaveWelcomeBO bo) {
         if (bo.getDefaultWelcomeFlag() == 1 && this.existDefaultWelcome(bo.getWxEnterpriseId())) {
-            throw new RuntimeException("已存在全体成员欢迎语, 无法新增多条");
+            throw new RuntimeException("已存在全体成员欢迎语, 无法新增多条-新增逻辑");
         }
         TabWelcome welcome = new TabWelcome();
         welcome.setWelcomeId(StringUtil.randomUUID());
@@ -143,6 +143,9 @@ public class WelcomeServiceImpl implements WelcomeService {
     }
 
     private TabWelcome updateWelcome(TabWelcome welcome, SaveWelcomeBO bo) {
+        if (bo.getDefaultWelcomeFlag() == 0 && this.existDefaultWelcome(bo.getWxEnterpriseId())) {
+            throw new RuntimeException("已存在全体成员欢迎语, 无法新增多条-更新逻辑");
+        }
         welcome.setTitle(bo.getTitle());
         welcome.setWelcomeContent(bo.getWelcomeContent());
         welcome.setUpdateTime(new Date());
@@ -281,7 +284,7 @@ public class WelcomeServiceImpl implements WelcomeService {
             // 小程序
             if (Objects.equals(WelcomeMediaTypeEnum.PROGRAM.getCode(), one.getMediaType())) {
                 // 小程序查询,直接根据id查询
-                TabMiniprogramSetting miniprogram = miniprogramSettingMapper.selectByPrimaryKey(one.getMiniProgramId());
+                TabMiniprogramSetting miniprogram = miniprogramSettingMapper.selectByPrimaryKey(one.getMiniprogramSettingId());
                 if (Objects.nonNull(miniprogram)) {
                     one.setMediaTitle(miniprogram.getTitle());
                     one.setMiniProgramName(miniprogram.getMiniprogramName());
@@ -485,7 +488,7 @@ public class WelcomeServiceImpl implements WelcomeService {
             bo.setMediaType(one.getMediaType());
             bo.setMediaUrl(one.getMediaUrl());
             bo.setMediaSize(one.getMediaSize());
-            bo.setMiniProgramId(one.getMiniProgramId());
+            bo.setMiniprogramSettingId(one.getMiniProgramId());
             return bo;
         }).collect(Collectors.toList());
     }

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/MiniprogramSettingServiceImpl.java

@@ -40,6 +40,11 @@ public class MiniprogramSettingServiceImpl implements MiniprogramSettingService
     private WxEnterpriseService wxEnterpriseService;
 
     @Override
+    public TabMiniprogramSetting getById(String miniprogramSettingId) {
+        return tabMiniprogramSettingMapper.selectByPrimaryKey(miniprogramSettingId);
+    }
+
+    @Override
     public void saveMiniprogramSetting(TabMiniprogramSetting miniprogramSetting) {
         if (null == miniprogramSetting.getMiniprogramSettingId()) {
             miniprogramSetting.setMiniprogramSettingId(ToolUtil.randomUUID());

haoban-manage3-service/src/main/resources/mapper/TabHaobanWelcomeMapper.xml

@@ -87,6 +87,9 @@
             <if test="operatorName != null">
                 operator_name = #{operatorName,jdbcType=TIMESTAMP},
             </if>
+            <if test="defaultWelcomeFlag != null">
+                default_welcome_flag = #{defaultWelcomeFlag,jdbcType=INTEGER},
+            </if>
         </set>
         where welcome_id = #{welcomeId,jdbcType=VARCHAR}
     </update>