111

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/MemberUnionidRelatedApiService.java

@@ -21,7 +21,7 @@ public interface MemberUnionidRelatedApiService {
 
 	List<MemberUnionidRelatedDTO> getByWxUserIdAndWxEnterpriseId(String wxUserId, String wxEnterpriseId);
 	
-	List<MemberUnionidRelatedDTO> listByWxEnterpriseIdAndDate(String wxEnterpriseId,Date date);
+	List<MemberUnionidRelatedDTO> listByEnterpriseIdAndDate(String enterpriseId,Date date);
 
 	List<MemberStoreDTO> listByExTernalUseridAndWxUserId(String externalUserid, String wxUserId);
 

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

@@ -32,7 +32,7 @@ public interface MemberUnionidRelatedMapper {
 
 	List<MemberUnionidRelated> getByWxUserIdAndWxEnterpriseId(@Param("wxUserId")String wxUserId, @Param("wxEnterpriseId")String wxEnterpriseId);
 	
-	List<MemberUnionidRelated> listByWxEnterpriseIdAndDate(@Param("wxEnterpriseId")String wxEnterpriseId,@Param("date")Date date);
+	List<MemberUnionidRelated> listByEnterpriseIdAndDate(@Param("enterpriseId")String enterpriseId,@Param("date")Date date);
 	
 	MemberUnionidRelated getByParams(@Param("wxUserId")String wxUserId, @Param("enterpriseId")String enterpriseId, 
 			@Param("externalName")String name, @Param("addCreateTime")String createTime);

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

@@ -636,8 +636,8 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
 		return list;
 	}
 	@Override
-	public List<MemberUnionidRelatedDTO> listByWxEnterpriseIdAndDate( String wxEnterpriseId,Date date) {
-		List<MemberUnionidRelated> list = memberUnionidRelatedMapper.listByWxEnterpriseIdAndDate(wxEnterpriseId,date);
+	public List<MemberUnionidRelatedDTO> listByEnterpriseIdAndDate( String enterpriseId,Date date) {
+		List<MemberUnionidRelated> list = memberUnionidRelatedMapper.listByEnterpriseIdAndDate(enterpriseId,date);
 		return EntityUtil.changeEntityListByJSON(MemberUnionidRelatedDTO.class,list);
 	}
 	

haoban-manage3-service/src/main/resources/mapper/MemberUnionidRelatedMapper.xml

@@ -230,12 +230,12 @@
     and status_flag = 1
     and wx_enterprise_id = #{wxEnterpriseId}
   </select>
-     <select id="listByWxEnterpriseIdAndDate" resultMap="BaseResultMap" parameterType="java.lang.String" >
+     <select id="listByEnterpriseIdAndDate" resultMap="BaseResultMap" parameterType="java.lang.String" >
     select 
     <include refid="Base_Column_List" />
     from tab_haoban_member_unionid_related
     where  status_flag = 1
-    and wx_enterprise_id = #{wxEnterpriseId}
+    and enterprise_id = #{enterpriseId}
     <if test="date != null" >
        and TO_DAYS(create_time) <![CDATA[ >= ]]> TO_DAYS(#{date,jdbcType=TIMESTAMP})
     </if>