Merge branch 'feature/xgh/成长值装修' into 'developer'

Feature/xgh/成长值装修

See merge request !2091

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

@@ -14,7 +14,7 @@ import com.gic.enterprise.api.dto.StoreDTO;
 import com.gic.enterprise.api.service.StoreService;
 import com.gic.haoban.manage.service.dao.mapper.WxEnterpriseMapper;
 import com.gic.haoban.manage.service.service.*;
-import com.gic.member.ext.api.enums.growth.EnterpriseGrowthRuleEnum;
+import com.gic.member.ext.api.enums.growth.GrowthRuleEnum;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
@@ -978,7 +978,7 @@ public class GroupChatServiceImpl implements GroupChatService {
                 Long groupChatId = user.getGroupChatId() ;
                 TabGroupChat group = this.groupChatMapper.selectById(groupChatId) ;
                 if(null != group) {
-                    this.externalMemberService.updateMemberGrowth(related.getEnterpriseId(),related.getMemberId(), EnterpriseGrowthRuleEnum.ADD_HAOBAN_GROUP.getRuleCode(), "群信息",group.getName() + "(" + groupChatId + ")");
+                    this.externalMemberService.updateMemberGrowth(related.getEnterpriseId(),related.getMemberId(), GrowthRuleEnum.ADD_HAOBAN_GROUP.getRuleCode(), "群信息",group.getName() + "(" + groupChatId + ")");
                 }
             }
         }

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

@@ -6,8 +6,8 @@ import java.util.List;
 import com.alibaba.fastjson.JSONObject;
 import com.gic.api.base.commons.ServiceResponse;
 import com.gic.commons.util.ToolUtil;
-import com.gic.member.ext.api.dto.growth.req.MemberGrowthOperationReq;
-import com.gic.member.ext.api.enums.growth.EnterpriseGrowthRuleEnum;
+import com.gic.member.ext.api.dto.growth.req.MemberGrowthChangeValueReq;
+import com.gic.member.ext.api.dto.growth.resp.MemberGrowthOperateResp;
 import com.gic.member.ext.api.service.MemberGrowthWriteApiService;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -101,14 +101,14 @@ public class ExternalMemberServiceImpl implements ExternalMemberService {
 
     public void updateMemberGrowth(String enterpriseId , String memberId , String ruleCode , String title , String remark) {
         try {
-            MemberGrowthOperationReq req = new MemberGrowthOperationReq();
+            MemberGrowthChangeValueReq req = new MemberGrowthChangeValueReq();
             req.setEnterpriseId(enterpriseId);
             req.setMemberId(memberId);
             req.setRuleCode(ruleCode);
             req.setChannelCode(com.gic.enterprise.api.enums.PlatformChannelEnum.C_WORK_WECHAT.getChannelCode());
             req.setOuterChangeId(ToolUtil.randomUUID());
             req = req.desc(title, remark);
-            ServiceResponse<Long> resp = this.memberGrowthWriteApiService.updateMemberGrowth(req);
+            ServiceResponse<MemberGrowthOperateResp> resp = this.memberGrowthWriteApiService.updateMemberGrowthChangeValue(req) ;
             logger.info("调用成长值={},{}", JSONObject.toJSONString(req), JSONObject.toJSONString(resp));
         }catch (Exception e) {
             logger.info("异常",e);

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

@@ -9,7 +9,7 @@ import com.gic.haoban.manage.api.util.notify.NoticeMessageUtil;
 import com.gic.haoban.manage.service.service.*;
 import com.gic.haoban.manage.service.util.EventUtils;
 import com.gic.haoban.manage.service.util.HBQwMonitorUtils;
-import com.gic.member.ext.api.enums.growth.EnterpriseGrowthRuleEnum;
+import com.gic.member.ext.api.enums.growth.GrowthRuleEnum;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
@@ -2007,7 +2007,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
             String  storeId = clerkDTO.getStoreId() ;
             StoreDTO storeDTO = storeService.getStore(storeId);
             if(null != storeDTO) {
-                this.externalMemberService.updateMemberGrowth(enterpriseId, memberId, EnterpriseGrowthRuleEnum.ADD_HAOBAN_FRIEND.getRuleCode(), "导购信息", clerkDTO.getClerkName() + "(" + clerkDTO.getClerkCode() + ") , " + storeDTO.getStoreName() + "(" + storeDTO.getStoreCode() + ")");
+                this.externalMemberService.updateMemberGrowth(enterpriseId, memberId, GrowthRuleEnum.ADD_HAOBAN_FRIEND.getRuleCode(), "导购信息", clerkDTO.getClerkName() + "(" + clerkDTO.getClerkCode() + ") , " + storeDTO.getStoreName() + "(" + storeDTO.getStoreCode() + ")");
             }
         }
     }