Merge remote-tracking branch 'origin/developer' into developer

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

@@ -149,6 +149,9 @@ public class StaffClerkRelationDTO implements Serializable {
     }
 
     public Integer getOpenConcatFlag() {
+        if(null == openConcatFlag) {
+            return 0 ;
+        }
         return openConcatFlag;
     }
 

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/hm/WxUserAddLogMapper.java

@@ -26,6 +26,8 @@ public interface WxUserAddLogMapper {
      */
     public int insert(TabWxUserAddLog entity);
 
+    public int updateMemberInfo(TabWxUserAddLog entity);
+
     /**
      * 
     * @Title: listAllForDel
@@ -47,8 +49,8 @@ public interface WxUserAddLogMapper {
     * @return
     * @throws
      */
-    public TabWxUserAddLog selectNewLog(@Param("externalUserid")String externalUserid, @Param("wxUserId")String wxUserId);
-    
+    public TabWxUserAddLog selectNewLog(@Param("externalUserid") String externalUserid,
+            @Param("wxUserId") String wxUserId);
 
     /**
      * 

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

@@ -27,7 +27,19 @@ public interface WxUserAddLogService {
      */
     public void save(WxUserAddLogQDTO qdto);
     
-    public void updateMemberInfo(String wxEnterpriseId , String wxUserId , String externalUserid , String memberId) ;
+    /**
+     * 
+    * @Title: updateMemberInfo
+    * @Description: 更新会员信息
+    * @author xugh
+    * @param wxEnterpriseId
+    * @param enterpriseId
+    * @param staffId
+    * @param externalUserid
+    * @param memberId
+    * @throws
+     */
+    public void updateMemberInfo(String wxEnterpriseId , String enterpriseId , String staffId , String externalUserid , String memberId) ;
     
     /**
      * 

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

 package com.gic.haoban.manage.service.service.hm.impl;
 
+import java.util.Date;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collectors;
 
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -111,8 +113,20 @@ public class WxUserAddLogServiceImpl implements WxUserAddLogService {
     }
 
     @Override
-    public void updateMemberInfo(String wxEnterpriseId,  String wxUserId , String externalUserid, String memberId) {
-        
+    public void updateMemberInfo(String wxEnterpriseId, String enterpriseId, String staffId, String externalUserid,
+            String memberId) {
+        if (StringUtils.isNotBlank(memberId)) {
+            TabWxUserAddLog entity = new TabWxUserAddLog();
+            entity = this.addMemberInfo(enterpriseId, memberId, entity);
+            entity.setEnterpriseId(enterpriseId);
+            entity.setWxEnterpriseId(wxEnterpriseId);
+            entity.setExternalUserid(externalUserid);
+            entity.setStaffId(staffId);
+            if (null != entity) {
+                entity.setCreateTime(new Date());
+                this.wxUserAddLogMapper.updateMemberInfo(entity);
+            }
+        }
     }
 
     // 冗余会员信息
@@ -120,7 +134,8 @@ public class WxUserAddLogServiceImpl implements WxUserAddLogService {
         String returnFields = "memberId,photoUrl,name,nickName,cardNo,gradeId,gradeName,phoneNumber";
         JSONObject memberObj = this.memberQueryService.queryDataSingle(enterpriseId, memberId, returnFields);
         if (null == memberObj) {
-            return entity;
+            log.info("会员不存在,memberId={}", memberId);
+            return null;
         }
         MemberDataDTO memberDataDTO = memberObj.toJavaObject(MemberDataDTO.class);
         entity.setMemberId(memberId);

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

@@ -381,7 +381,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
         }
 
         log.info("插入加好友日志");
-        wxUserAddLogService.updateMemberInfo(wxEnterpriseId,externalUserId,memberId, null);
+        wxUserAddLogService.updateMemberInfo(wxEnterpriseId,enterpriseId,staffId,externalUserId,memberId);
     }
 
     /**

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

@@ -279,6 +279,7 @@ public class HmLinkApiServiceImpl implements HmLinkApiService {
             if (openFlag == 1) {
                 // 门店规则1推荐门店 2附件门店
                 int storeType = storeRuleObj.getIntValue("store_type");
+                // 过滤有活码的门店
                 List<HmLinkStoreDTO> storeList = this.hmLinkStoreService.listByLinkId(wxEnterpriseId, enterpriseId,
                         linkId);
                 log.info("门店规则={},推荐门店列表={}", storeType, JSON.toJSONString(storeList));

haoban-manage3-service/src/main/resources/dubbo-haoban-manage-service.xml

@@ -176,6 +176,7 @@
                      interface="com.gic.enterprise.api.service.StoreWidgetService" timeout="10000"
                      retries="0" check="false"/>
    <dubbo:reference interface="com.gic.enterprise.api.service.EnterpriseUseForbidService" id="enterpriseUseForbidService"/>                  
+   <dubbo:reference id="memberTagOpenApiService" interface="com.gic.member.tag.api.service.MemberTagOpenApiService" timeout="10000" retries="0" check="false"/>
                      
 
 

haoban-manage3-service/src/main/resources/mapper/hm/WxUserAddLogMapper.xml

@@ -106,6 +106,7 @@
 	  member_label_name,
 	  create_time,
 	  update_time,
+	  add_time ,
 	  all_del_flag 
   )VALUES(
 	  #{logId,jdbcType=BIGINT},
@@ -139,11 +140,31 @@
 	  #{memberLabelName,jdbcType=VARCHAR},
 	  now(),
 	  now(),
+	  now(),
 	  #{allDelFlag,jdbcType=INTEGER}
   )
   ]]>
 	</insert>
 
+
+	<update id="updateMemberInfo" parameterType="com.gic.haoban.manage.service.entity.hm.TabWxUserAddLog">
+		  UPDATE tab_haoban_wx_user_add_log SET
+			  member_id=#{memberId,jdbcType=VARCHAR},
+			  member_name=#{memberName,jdbcType=VARCHAR},
+			  member_nick=#{memberNick,jdbcType=VARCHAR},
+			  member_image=#{memberImage,jdbcType=VARCHAR},
+			  member_phone=#{memberPhone,jdbcType=VARCHAR},
+			  member_grade_id=#{memberGradeId,jdbcType=VARCHAR},
+			  member_grade_name=#{memberGradeName,jdbcType=VARCHAR},
+			  member_card_no=#{memberCardNo,jdbcType=VARCHAR},
+			  <if test="null != createTime">
+			  	 create_time = #{createTime} ,
+			  </if>
+			  update_time=now()  WHERE 
+		    external_userid=#{externalUserid} and staff_id=#{staffId} and membre_id is null 
+	</update>
+
+
 	<select id="listAllForDel"
 		parameterType="com.gic.haoban.manage.service.entity.hm.TabWxUserAddLog"
 		resultMap="result-map-tabHaobanWxUserAddLog">
@@ -162,10 +183,13 @@
 		status_flag != 0 order by create_time desc limit 1
 	</select>
 
-	<select id="listForPage" parameterType="com.gic.haoban.manage.api.dto.qdto.hm.WxUserAddLogSearchQDTO" resultMap="result-map-tabHaobanWxUserAddLog">
+	<select id="listForPage"
+		parameterType="com.gic.haoban.manage.api.dto.qdto.hm.WxUserAddLogSearchQDTO"
+		resultMap="result-map-tabHaobanWxUserAddLog">
 		select
 		<include refid="Base_Column_List" />
 		from tab_haoban_wx_user_add_log where 1
-		and status_flag != 0 order by create_time desc 
+		and status_flag != 0 order by
+		create_time desc
 	</select>
 </mapper> 
\ No newline at end of file

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/LoginController.java

@@ -319,7 +319,7 @@ public class LoginController extends WebBaseController {
     private String doLogin(String wxEnterpriseId, String gicEnterpriseId, String loginPhoneNumber, String loginChannel,
             HttpServletResponse response, String operationUserId, String userName) {
         //运维单点登录信息：operationUserId  userName ： 运维realName
-        logger.info("doLogin={},{}",gicEnterpriseId,loginPhoneNumber);
+        logger.info("doLogin={},{},{},{}",gicEnterpriseId,loginPhoneNumber, operationUserId, userName);
         WxApplicationDTO application = wxApplicationApiService.selectByWxEnterpriseIdAndApplicationType(wxEnterpriseId,2);
         if (null == application) {
             logger.info("登录企业应用 没授权!gicEnterpriseId:{}", gicEnterpriseId);
@@ -567,7 +567,7 @@ public class LoginController extends WebBaseController {
     @RequestMapping("/gic-login-check")
     @IgnoreLogin
     public ModelAndView gicLogin(String code, String hbEnt,String hbPage, String operationUserId, String userName) {
-        logger.info("gic登录clerkId={},hbEnt={}", code, hbEnt);
+        logger.info("gic登录clerkId={},hbEnt={},operationUserId={},userName={}", code, hbEnt, operationUserId, userName);
         PowerClerkDTO clerkDTO = this.userService.haobanLoginBack(code);
         if (clerkDTO == null) {
             logger.info("从gic后台登录,传入clerkId={}无效", code);

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/WelcomeController.java

@@ -23,6 +23,7 @@ import com.gic.haoban.manage.api.enums.hm.HmWelcomeType;
 import com.gic.haoban.manage.api.service.hm.HmWelcomeRelationApiService;
 import com.gic.haoban.manage.api.service.out.WelcomeApiService;
 import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
+import com.gic.haoban.manage.web.log.LogRecordAfterServiceImpl;
 import com.gic.haoban.manage.web.log.LogRecordUserServiceImpl;
 import com.gic.haoban.manage.web.qo.welcome.ListWelcomeQO;
 import com.gic.haoban.manage.web.qo.welcome.SaveFriendSettingQO;
@@ -31,6 +32,7 @@ import com.gic.log.record.anno.GicLogRecord;
 import com.gic.log.record.util.GicLogRecordCategoryEnum;
 import com.gic.log.record.util.GicLogRecordEvaluationContext;
 import com.gic.log.record.util.GicLogRecordOptTypeEnum;
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -83,7 +85,7 @@ public class WelcomeController extends WebBaseController {
      * @date : 2022/2/11
      */
     @GicLogRecord(value = "${#logContent}", category = GicLogRecordCategoryEnum.HUOMA, optType = GicLogRecordOptTypeEnum.WELCOME_ADD
-            ,optPage = "引流链接-落地页模板", userFunc = LogRecordUserServiceImpl.class )
+            ,optPage = "欢迎语设置-新建欢迎语", userFunc = LogRecordUserServiceImpl.class, afterFunc = LogRecordAfterServiceImpl.class)
     @RequestMapping(value = "/save", method = RequestMethod.POST)
     public RestResponse<Boolean> saveWelcome(@RequestBody @Valid SaveWelcomeQO qo) {
         WebLoginDTO login = AuthWebRequestUtil.getLoginUser();
@@ -107,19 +109,27 @@ public class WelcomeController extends WebBaseController {
             qdto.setType(HmWelcomeType.NORMAL.getCode());
         }
         String logContent = "";
+        if (HmWelcomeType.NORMAL.getCode().equals(qdto.getType())){
+            GicLogRecordEvaluationContext.putAttribute(LogRecordAfterServiceImpl.WELCOME_TYPE, HmWelcomeType.NORMAL.getCode());
+            logContent = "新增普通欢迎语";
+        }else {
+            GicLogRecordEvaluationContext.putAttribute(LogRecordAfterServiceImpl.WELCOME_TYPE, HmWelcomeType.SPECIAL.getCode());
+            logContent = "新增特殊欢迎语";
+        }
         if (qdto.getWelcomeId() == null) {
-            logContent = "新增特殊欢迎语【" + qdto.getTitle() + "】";
+            logContent = logContent + "【" + qdto.getTitle() + "】";
+            GicLogRecordEvaluationContext.putAttribute(LogRecordAfterServiceImpl.WELCOME_OPT, "add");
         } else {
+            GicLogRecordEvaluationContext.putAttribute(LogRecordAfterServiceImpl.WELCOME_OPT, "edit");
             ServiceResponse<WelcomeDetailDTO> welcomeResult = welcomeApiService.getWelcome(qdto.getWelcomeId(), qdto.getWxEnterpriseId());
             if (welcomeResult.getResult() != null) {
-                //
                 WelcomeDetailDTO welcomeDetail = welcomeResult.getResult();
                 logContent = this.buildEditWelcomeOpLog(welcomeDetail, qdto);
             }
         }
         GicLogRecordEvaluationContext.putAttribute("logContent", logContent);
         ServiceResponse<Boolean> response = welcomeApiService.saveWelcome(qdto);
-        if (response.isSuccess()){
+        if (!response.isSuccess()){
             GicLogRecordEvaluationContext.noWriteLog();
         }
         return RestResponse.successResult(response.getResult());
@@ -141,9 +151,11 @@ public class WelcomeController extends WebBaseController {
             oldMedia.add(WelcomeMediaTypeEnum.getDescByCode(welcomeMediaDTO.getMediaType()) + "-" + welcomeMediaDTO.getMediaTitle());
         }
         List<String> newMedia = new ArrayList<>();
+        if (CollectionUtils.isNotEmpty(qdto.getWelcomeMediaList())) {
             for (SaveWelcomeMediaQDTO saveWelcomeMediaQDTO : qdto.getWelcomeMediaList()) {
                 newMedia.add(WelcomeMediaTypeEnum.getDescByCode(saveWelcomeMediaQDTO.getMediaType()) + "-" + saveWelcomeMediaQDTO.getMediaTitle());
             }
+        }
         stringBuilder.append(StringUtils.join(oldMedia, "、"))
                 .append("」变更为「")
                 .append(StringUtils.join(newMedia, "、"))
@@ -160,7 +172,7 @@ public class WelcomeController extends WebBaseController {
      * @date : 2022/2/11
      */
     @GicLogRecord(value = "${#logContent}", category = GicLogRecordCategoryEnum.HUOMA, optType = GicLogRecordOptTypeEnum.WELCOM_DEL
-            ,optPage = "引流链接-落地页模板", userFunc = LogRecordUserServiceImpl.class )
+            ,optPage = "欢迎语设置-特殊欢迎语", userFunc = LogRecordUserServiceImpl.class )
     @RequestMapping(value = "/remove")
     public RestResponse<?> removeWelcome(@RequestParam("welcomeId") String welcomeId) {
         if (StringUtils.isEmpty(welcomeId)) {

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/log/LogRecordAfterServiceImpl.java

+package com.gic.haoban.manage.web.log;
+
+import com.gic.log.record.bean.GicLogRecordBean;
+import com.gic.log.record.service.LogRecordAfterService;
+import com.gic.log.record.util.GicLogRecordEvaluationContext;
+import com.gic.log.record.util.GicLogRecordOptTypeEnum;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Component;
+
+/**
+ * @Author MUSI
+ * @Date 2022/7/15 11:50 AM
+ * @Description
+ * @Version
+ **/
+@Component
+public class LogRecordAfterServiceImpl extends LogRecordAfterService {
+
+    public static final String WELCOME_TYPE = "welcome_type";
+    public static final String WELCOME_OPT = "welcome_opt";
+
+    @Override
+    public void deal(GicLogRecordBean gicLogRecordBean) {
+        String value = GicLogRecordEvaluationContext.getAttribute(WELCOME_OPT, String.class);
+        if ("add".equals(value)){
+            // 新建普通欢迎语
+            this.changeLogRecordOptType(gicLogRecordBean, GicLogRecordOptTypeEnum.WELCOME_ADD);
+        }
+        if (StringUtils.equals("edit", value)){
+            // 编辑普通欢迎语
+            this.changeLogRecordOptType(gicLogRecordBean, GicLogRecordOptTypeEnum.WELCOM_UPDATE);
+        }
+    }
+
+    private void changeLogRecordOptType(GicLogRecordBean gicLogRecordBean, GicLogRecordOptTypeEnum optTypeEnum){
+        if (gicLogRecordBean == null || optTypeEnum == null){
+            return;
+        }
+        gicLogRecordBean.setOptType(optTypeEnum.getType());
+        gicLogRecordBean.setOptTypeName(optTypeEnum.getName());
+        gicLogRecordBean.setSystemType(optTypeEnum.getSystemType());
+    }
+}

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/vo/WebLoginVO.java

@@ -22,6 +22,12 @@ public class WebLoginVO implements Serializable {
     private String gicHost ;
     private String staffId ;
 
+    /**
+     * 运维登录相关信息。新版运维登录、运维登录GIC再登录好办
+     */
+    private String operationUserId;
+    private String operationUserName;
+
     public String getStaffId() {
         return staffId;
     }
@@ -125,4 +131,22 @@ public class WebLoginVO implements Serializable {
     public void setEnterpriseId(String enterpriseId) {
         this.enterpriseId = enterpriseId;
     }
+
+    public String getOperationUserId() {
+        return operationUserId;
+    }
+
+    public WebLoginVO setOperationUserId(String operationUserId) {
+        this.operationUserId = operationUserId;
+        return this;
+    }
+
+    public String getOperationUserName() {
+        return operationUserName;
+    }
+
+    public WebLoginVO setOperationUserName(String operationUserName) {
+        this.operationUserName = operationUserName;
+        return this;
+    }
 }