Skip to content

H
haoban-manage3.0
Commit 5565d586 by 徐高华
Options

api

parent 6e8ee5f7
Showing with 36 additions and 56 deletions
haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/hm/HmLinkController.java
......@@ -27,6 +27,7 @@ import com.gic.haoban.manage.api.dto.welcome.dto.WelcomeDetailDTO;
import com.gic.haoban.manage.api.service.hm.HmLinkApiService;
import com.gic.haoban.manage.api.service.hm.HmPageApiService;
import com.gic.haoban.manage.api.service.out.WelcomeApiService;
import com.gic.member.tag.api.dto.MemberTagItemDTO;
import com.gic.member.tag.api.service.MemberTagApiService;
/**
......@@ -83,7 +84,7 @@ public class HmLinkController {
// 编辑引流活码【链接ID-链接名称】：链接名称「 链接名称」变更「 链接名称」，链接描述「 链接描述」变更「 链接描述」，链接标签「
// 标签名称-标签值名称」变更为「 标签名称-标签值名称」，分配规则「 层级x-子项名称」关闭，「 层级x-子项名称」开启，欢迎语「
// 欢迎语名称」变更为「 欢迎语名称」，欢迎语变更为「 不发送欢迎语」，欢迎语变更为「 活码欢迎语-欢迎语名称」
private static String getLog(HmLinkDTO oldDTO, HmLinkDTO newDTO) {
private String getLog(HmLinkDTO oldDTO, HmLinkDTO newDTO) {
String wxEnterpriseId = newDTO.getWxEnterpriseId();
String enterpriseId = newDTO.getEnterpriseId();
StringBuilder sb = new StringBuilder("编辑引流活码").append("【").append(oldDTO.getLinkCode()).append("-")
......@@ -98,7 +99,7 @@ public class HmLinkController {
}
// type 会员标签1 , 2 欢迎语
public static void comp(String wxEnterpriseId, String enterpriseId, String title, String oldValue, String newValue,
public void comp(String wxEnterpriseId, String enterpriseId, String title, String oldValue, String newValue,
StringBuilder sb, int type) {
if (null == oldValue) {
oldValue = "";
......@@ -110,33 +111,37 @@ public class HmLinkController {
sb.append(title).append("「").append(oldValue).append("」变更「").append(newValue).append("」");
}
// 会员标签
/*
* if (type == 1 && !oldValue.equals(newValue)) { MemberTagItemDTO
* oldResp = this.memberTagApiService.findMemberTagItem(oldValue);
* MemberTagItemDTO newResp =
* this.memberTagApiService.findMemberTagItem(newValue); if (null !=
* oldResp) { oldValue = oldResp.getTagName() + "-" +
* oldResp.getTagItemName(); } if (null != newResp) { newValue =
* newResp.getTagName() + "-" + newResp.getTagItemName(); }
* sb.append(title).append("「").append(oldValue).append("」变更「").append(
* newValue).append("」"); } // 欢迎语 if (type == 2 &&
* !oldValue.equals(newValue)) { if (StringUtils.isEmpty(oldValue)) {
* ServiceResponse<WelcomeDetailDTO> resp =
* this.welcomeApiService.getWelcome(newValue, enterpriseId); if (null
* != resp && null != resp.getResult()) {
* sb.append("欢迎语变更为").append("「").append(resp.getResult().getTitle()).
* append("」"); } } else if (StringUtils.isEmpty(newValue)) {
* sb.append("欢迎语变更为").append("「").append("不发送欢迎语").append("」"); } else
* { ServiceResponse<WelcomeDetailDTO> oldResp =
* this.welcomeApiService.getWelcome(oldValue, enterpriseId);
* ServiceResponse<WelcomeDetailDTO> newResp =
* this.welcomeApiService.getWelcome(newValue, enterpriseId); if (null
* != oldResp && null != oldResp.getResult()) { oldValue =
* oldResp.getResult().getTitle(); } if (null != newResp && null !=
* newResp.getResult()) { newValue = newResp.getResult().getTitle(); }
* sb.append(title).append("「").append(oldValue).append("」变更「").append(
* newValue).append("」"); } }
*/
if (type == 1 && !oldValue.equals(newValue)) {
MemberTagItemDTO oldResp = this.memberTagApiService.findMemberTagItem(oldValue);
MemberTagItemDTO newResp = this.memberTagApiService.findMemberTagItem(newValue);
if (null != oldResp) {
oldValue = oldResp.getTagName() + "-" + oldResp.getTagItemName();
}
if (null != newResp) {
newValue = newResp.getTagName() + "-" + newResp.getTagItemName();
}
sb.append(title).append("「").append(oldValue).append("」变更「").append(newValue).append("」");
} // 欢迎语
if (type == 2 && !oldValue.equals(newValue)) {
if (StringUtils.isEmpty(oldValue)) {
ServiceResponse<WelcomeDetailDTO> resp = this.welcomeApiService.getWelcome(newValue, enterpriseId);
if (null != resp && null != resp.getResult()) {
sb.append("欢迎语变更为").append("「").append(resp.getResult().getTitle()).append("」");
}
} else if (StringUtils.isEmpty(newValue)) {
sb.append("欢迎语变更为").append("「").append("不发送欢迎语").append("」");
} else {
ServiceResponse<WelcomeDetailDTO> oldResp = this.welcomeApiService.getWelcome(oldValue, enterpriseId);
ServiceResponse<WelcomeDetailDTO> newResp = this.welcomeApiService.getWelcome(newValue, enterpriseId);
if (null != oldResp && null != oldResp.getResult()) {
oldValue = oldResp.getResult().getTitle();
}
if (null != newResp && null != newResp.getResult()) {
newValue = newResp.getResult().getTitle();
}
sb.append(title).append("「").append(oldValue).append("」变更「").append(newValue).append("」");
}
}
// 分批规则
if (type == 3) {
JSONObject oldStoreRuleObj = JSONObject.parseObject(oldValue);
......@@ -382,31 +387,4 @@ public class HmLinkController {
return RestResponse.successResult(retMap);
}
public static void main(String[] args) {
/*
* StringBuilder sb = new StringBuilder() ; comp("1", "1", "分配规则",
* "{\"fw_store\":{\"open\":1,\"zs\":1,\"dz\":1,\"dy\":1},\"xg_store\":{\"open\":0,\"zs\":1,\"dz\":1,\"dy\":1}}"
* ,
* "{\"fw_store\":{\"open\":1,\"zs\":1,\"dz\":1,\"dy\":1},\"xg_store\":{\"open\":1,\"zs\":1,\"dz\":1,\"dy\":1}}",
* sb, 3); System.out.println(sb.toString());
*/
/*
* StringBuilder sb = new StringBuilder() ; comp("1", "1", "分配规则",
* "{\"fw_store\":{\"open\":1,\"zs\":1,\"dz\":1,\"dy\":1},\"xg_store\":{\"open\":1,\"zs\":1,\"dz\":1,\"dy\":0}}"
* ,
* "{\"fw_store\":{\"open\":1,\"zs\":0,\"dz\":1,\"dy\":1},\"xg_store\":{\"open\":1,\"xg\":1,\"dz\":1,\"dy\":0}}",
* sb, 3); System.out.println(sb.toString());
*/
StringBuilder sb = new StringBuilder();
comp("1", "1", "分配规则",
"{\"store_type\":2,\"open\":1,\"store\":{\"dz\":0,\"dy\":1,\"ndz\":0,\"ndy\":1}, \"city_store\":{\"open\":1,\"dz\":0,\"dy\":1}}",
"{\"store_type\":2,\"open\":1,\"store\":{\"dz\":1,\"dy\":1,\"ndz\":1,\"ndy\":1}, \"city_store\":{\"open\":1,\"dz\":1,\"dy\":1}}",
sb, 4);
System.out.println(sb);
// comp(wxEnterpriseId, enterpriseId, "分配规则",
// oldDTO.getCustomRuleJson(), newDTO.getCustomRuleJson(), sb, 4);
}
}
haoban-manage3-web/src/main/webapp/WEB-INF/dubbo-haoban-manage-web.xml
......@@ -15,6 +15,8 @@
<dubbo:protocol name="dubbo" port="30009"/>
<dubbo:reference interface="com.gic.member.tag.api.service.MemberTagApiService" id="memberTagApiService" timeout="10000"/>
<dubbo:reference interface="com.gic.clerk.api.service.PowerService" id="powerService" timeout="10000"/>
<dubbo:reference interface="com.gic.haoban.manage.api.service.HaobanUserApiService" id="haobanUserApiService" timeout="10000"/>
<dubbo:reference interface="com.gic.clerk.api.service.RightService" id="rightService" timeout="10000"/>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment