广告标记微信群

pcloud-service-book/src/main/java/com/pcloud/book/advertising/biz/impl/AdvertisingSpaceBizImpl.java

@@ -2354,10 +2354,10 @@ public class AdvertisingSpaceBizImpl implements AdvertisingSpaceBiz {
             throw new BookBizException(BookBizException.PARAM_IS_ERROR, "广告主不存在！");
         }
         //包含品牌方结算方式
-        List<String> methods = advertisingMaster.getSettlementMethodList().stream().filter(s -> s.getSettlementMethod() != null).map(AdvertisingSettlementMethod::getSettlementMethod).collect(Collectors.toList());
-        if (methods.contains(SettlementMethodEnum.Brand.code)) {
+//        List<String> methods = advertisingMaster.getSettlementMethodList().stream().filter(s -> s.getSettlementMethod() != null).map(AdvertisingSettlementMethod::getSettlementMethod).collect(Collectors.toList());
+        /*if (methods.contains(SettlementMethodEnum.Brand.code)) {
             Long loginId = master.getLoginId();
-            /*if (StringUtil.isEmpty(advertisingMaster.getLoginName()) || StringUtil.isEmpty(advertisingMaster.getPassword())) {
+            *//*if (StringUtil.isEmpty(advertisingMaster.getLoginName()) || StringUtil.isEmpty(advertisingMaster.getPassword())) {
                 throw new BookBizException(BookBizException.PARAM_IS_ERROR, "登录名或密码为空！");
             }
             if (null == loginId) {//新增账号
@@ -2365,18 +2365,18 @@ public class AdvertisingSpaceBizImpl implements AdvertisingSpaceBiz {
                 advertisingMaster.setLoginId(loginId);
             } else {//修改账号
                 partyConsr.updateLoginAccount(advertisingMaster.getLoginName(), advertisingMaster.getPassword(), loginId);
-            }*/
+            }*//*
             //账号修改通过子账号完成
             if (null == loginId) {
                 LOGGER.error("广告主" + masterId + "是品牌方结算，子账号为空");
             }
         } else {
             if (null != master.getLoginId()) {//删除账号，标记记录
-//                partyConsr.deleteLoginAccount(master.getLoginId());
+                partyConsr.deleteLoginAccount(master.getLoginId());
                 advertisingMaster.setLoginId(null);
                 advertisingGroupTagDao.deleteByMasterId(masterId);
             }
-        }
+        }*/
         advertisingMasterDao.update(advertisingMaster);
         // 删除广告主之前配置的结算方式
         advertisingSettlementMethodDao.deleteByMasterId(masterId);

pcloud-service-book/src/main/resources/mapper/advertising/AdvertisingMasterMapper.xml

@@ -103,7 +103,9 @@
                 master_name = #{masterName,jdbcType=VARCHAR},
             </if>
             update_time = NOW(),
-            login_id = #{loginId},
+            <if test="loginId != null">
+                login_id = #{loginId},
+            </if>
         </set>
         where id = #{id,jdbcType=BIGINT}
     </update>