更新好友日志

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,9 +49,9 @@ 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);
+
     /**
      * 
     * @Title: listAllForDel

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;
@@ -109,18 +111,31 @@ public class WxUserAddLogServiceImpl implements WxUserAddLogService {
         this.wxUserAddLogMapper.insert(entity);
 
     }
-    
+
     @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);
+            }
+        }
     }
-    
+
     // 冗余会员信息
     private TabWxUserAddLog addMemberInfo(String enterpriseId, String memberId, TabWxUserAddLog entity) {
         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/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/mapper/hm/WxUserAddLogMapper.xml

@@ -106,7 +106,8 @@
 	  member_label_name,
 	  create_time,
 	  update_time,
-	  all_del_flag
+	  add_time ,
+	  all_del_flag 
   )VALUES(
 	  #{logId,jdbcType=BIGINT},
 	  #{wxEnterpriseId,jdbcType=VARCHAR},
@@ -139,11 +140,31 @@
 	  #{memberLabelName,jdbcType=VARCHAR},
 	  now(),
 	  now(),
+	  now(),
 	  #{allDelFlag,jdbcType=INTEGER}
   )
   ]]>
 	</insert>
 
+
+	<update 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()
+		  log_id = external_userid=#{} 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